Mercurial > dnsbl
changeset 113:a893afee4b80 stable-5-11
move to autoconf/automake/docbook
| author | carl |
|---|---|
| date | Tue, 20 Dec 2005 17:35:16 -0800 |
| parents | 96b2eb7f25f5 |
| children | f4f5fb263072 |
| files | ChangeLog NEWS dnsbl.rc dnsbl.spec.in package src/Makefile.am |
| diffstat | 6 files changed, 20 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Dec 18 16:56:38 2005 -0800 +++ b/ChangeLog Tue Dec 20 17:35:16 2005 -0800 @@ -1,5 +1,8 @@ $Id$ +5.11 2005-12-20 + switch to autoconf/automake/docbook + 5.10 2005-10-16 Fix a compile error on Fedora Core 3. Discovered by Nigel Horne <njh@bandsman.co.uk>
--- a/NEWS Sun Dec 18 16:56:38 2005 -0800 +++ b/NEWS Tue Dec 20 17:35:16 2005 -0800 @@ -1,6 +1,6 @@ $Id$ -5.11 2005-12-18 switch to autoconf/automake/docbook +5.11 2005-12-20 switch to autoconf/automake/docbook 5.10 2005-10-16 fix compile error on FC3 5.9 2005-09-26 fix bug with empty return paths 5.8 2005-09-25 allow empty env_to at global context level
--- a/dnsbl.rc Sun Dec 18 16:56:38 2005 -0800 +++ b/dnsbl.rc Tue Dec 20 17:35:16 2005 -0800 @@ -21,7 +21,7 @@ # Start daemons. echo -n "Starting dnsbl-milter: " if [ ! -f /var/lock/subsys/dnsbl ]; then - cd SYSCONFDIR # conf file is here + cd SYSCONFDIR/dnsbl # conf file is here SBINDIR/dnsbl -d 10 -r /var/run/dnsbl/dnsbl.resolver.sock -p local:/var/run/dnsbl/dnsbl.sock RETVAL=$? pid=`pidof -s SBINDIR/dnsbl`
--- a/dnsbl.spec.in Sun Dec 18 16:56:38 2005 -0800 +++ b/dnsbl.spec.in Tue Dec 20 17:35:16 2005 -0800 @@ -11,16 +11,17 @@ URL: http://www.five-ten-sg.com/@PACKAGE@/ Vendor: 510 Software Group Packager: 510 Software Group +AutoReqProv: no -Requires(pre): /usr/sbin/groupadd Requires(pre): /usr/sbin/useradd Requires(pre): /usr/bin/getent Requires(postun): /usr/sbin/userdel -Requires(postun): /usr/sbin/groupdel Requires(post,preun): /sbin/chkconfig +Requires(post,preun): /sbin/service BuildRequires: sendmail-devel >= 8.12.1 Requires: sendmail >= 8.12.1 Requires: sendmail-cf +Requires: libc.so.6, libgcc_s.so.1, libm.so.6, libpthread.so.0, libstdc++.so.6 %description @@ -66,17 +67,15 @@ %pre -/usr/bin/getent passwd dnsbl || +/usr/bin/getent passwd dnsbl >/dev/null || useradd -r -d /etc/dnsbl -M -c "dnsbl pseudo-user" -s /sbin/nologin dnsbl %post /sbin/chkconfig --add @PACKAGE@ -/sbin/chkconfig dnsbl on -/sbin/service dnsbl start echo Remember to edit %{_sysconfdir}/@PACKAGE@/@PACKAGE@.conf and add the following line to your sendmail.mc: -echo "INPUT_MAIL_FILTER(\`dnsbl\', \`S=local:/var/run/dnsbl/dnsbl.sock, F=T, T=C:30s;S:5m;R:5m;E:5m\')" +echo "INPUT_MAIL_FILTER(\`dnsbl', \`S=local:/var/run/dnsbl/dnsbl.sock, F=T, T=C:30s;S:5m;R:5m;E:5m')" echo
--- a/package Sun Dec 18 16:56:38 2005 -0800 +++ b/package Tue Dec 20 17:35:16 2005 -0800 @@ -11,18 +11,18 @@ make -f *cvs ./configure >/dev/null (cd xml; make; make distclean) -# cp -a html/*html $web +cp -a html/*html $web make distcheck >$distlog 2>&1 if [ $? -eq 0 ]; then if [ -f $BALL ]; then # expand locally to see the tarball rm -rf junk - ## mkdir junk - ## cd junk - ## tar xfz ../$BALL - ## cd $NAME-$VER - ## ./configure >/dev/null - ## make >/dev/null + mkdir junk + cd junk + tar xfz ../$BALL + cd $NAME-$VER + ./configure >/dev/null + make >/dev/null ## make install >/dev/null ## if [ -f /etc/rc.d/init.d/$NAME ]; then ## /etc/rc.d/init.d/$NAME stop @@ -32,8 +32,8 @@ ## chkconfig $NAME on ## /etc/rc.d/init.d/$NAME start ## fi - ## cd .. - ## cd .. + cd .. + cd .. # build rpm on target target=host62
--- a/src/Makefile.am Sun Dec 18 16:56:38 2005 -0800 +++ b/src/Makefile.am Tue Dec 20 17:35:16 2005 -0800 @@ -1,5 +1,6 @@ sbin_PROGRAMS = dnsbl dnsbl_SOURCES = dnsbl.cpp dnsbl.h context.cpp context.h tokenizer.cpp tokenizer.h scanner.cpp scanner.h includes.h +EXTRA_DIST = test.cpp # set the include path found by configure INCLUDES= $(all_includes)