Conflicts: junkbuster-raw junkbuster-blank
%description
-The Internet Junkbuster is an application that provides privacy and
-security to the user of the world wide web. It controls cookies,
-removes advertisements or pop-up windows. You can actually modify the
-content of web pages on-the-fly.
+The Internet Junkbuster stops your browser from displaying the
+advertisement images that pervade many commercial web pages. Since
+your browser has to download fewer images, surfing the web should be
+faster.
%define ijbconf %{_sysconfdir}/junkbuster
%setup -c -n ijbswa
%build
+OPT_FLAGS="$RPM_OPT_FLAGS -Ipcre -Wall"
./configure
-make
+make "CFLAGS=$OPT_FLAGS"
strip junkbuster
%pre
-/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust > /dev/null 2>&1 || /bin/true
+/usr/sbin/useradd -d /etc/junkbuster -u 73 -r junkbust -s "" > /dev/null 2>&1 || /bin/true
%install
rm -rf $RPM_BUILD_ROOT
${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
install -s -m 744 junkbuster $RPM_BUILD_ROOT%{_sbindir}/junkbuster
-# cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
+cp -f junkbuster.1 $RPM_BUILD_ROOT%{_mandir}/man8/junkbuster.8
cp -f actionsfile $RPM_BUILD_ROOT%{ijbconf}/actionsfile
cp -f re_filterfile $RPM_BUILD_ROOT%{ijbconf}/re_filterfile
cp -f trust $RPM_BUILD_ROOT%{ijbconf}/trust
if [ "$1" = "1" ]; then
/sbin/chkconfig --add junkbuster
fi
+# for upgrade from 2.0.x
+chown junkbust:junkbust /var/log/junkbuster/* 2>/dev/null
+[ -f /var/log/junkbuster/junkbuster ] &&\
+ mv -f /var/log/junkbuster/junkbuster /var/log/junkbuster/logfile || true
%preun
if [ "$1" = "0" ]; then
%attr(0744,junkbust,junkbust) %dir /var/log/junkbuster
%config %{_sysconfdir}/logrotate.d/junkbuster
%attr(0744,junkbust,junkbust)/usr/sbin/junkbuster
-# %{_mandir}/man8/*
+%{_mandir}/man8/*
%config %{_sysconfdir}/rc.d/init.d/junkbuster
%changelog
+* Thu Sep 13 2001 Hal Burgiss <hal@foobox.net>
+- Added $RPM_OPT_FLAGS support, renaming of old logfile, and
+- made sure no default shell exists for user junkbust.
* Sun Jun 3 2001 Stefan Waldherr <stefan@waldherr.org>
- rework of RPM