[rpms/inn] epel10: auto-import changelog data from inn-2.3.3-4.src.rpm

[cvsdist <cvsdist@fedoraproject.org>]

            A new commit has been pushed.

            Repo   : rpms/inn
            Branch : epel10
            Commit : 74075fbf2f6a0b89a31ac21f76ef84974154bc3e
            Author : cvsdist <cvsdist@fedoraproject.org>
            Date   : 2004-09-09T06:17:10+00:00
            Stats  : +41/-21 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/inn/c/74075fbf2f6a0b89a31ac21f76ef84974154bc3e?branch=epel10

            Log:
            auto-import changelog data from inn-2.3.3-4.src.rpm
Thu Jul 18 2002 Florian La Roche <Florian.LaRoche@redhat.de>
- make check if networking is up more robust in initscript
- move most apps into /usr/lib/news/bin for less namespace pollution
Tue Jun 18 2002 Florian La Roche <Florian.LaRoche@redhat.de>
- add some cvs patches
- crude hack to change LOCK_READ and LOCK_WRITE within INN source code
Mon May 27 2002 Florian La Roche <Florian.LaRoche@redhat.de>
- update to inn-2.3.3
- use db4

---
diff --git a/.cvsignore b/.cvsignore
index 38535a3..4dcabdb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-inn-2.3.2.tar.gz
+inn-2.3.3.tar.gz
 inn-faq.tar.gz

diff --git a/inn.spec b/inn.spec
index 41761f1..548274b 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
 Summary: The InterNetNews (INN) system, an Usenet news server.
 Name: inn
-Version: 2.3.2
-Release: 12
+Version: 2.3.3
+Release: 4
 Copyright: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -12,7 +12,9 @@ Source7: inn-cron-nntpsend
 Source8: innd.init
 Source10: inn-faq.tar.gz
 Patch: inn-2.3.1-rh.patch
-BuildRequires: db3-devel
+Patch1: inn-2.3.4-cvs.patch
+Patch2: inn-2.3.3-strerror.patch
+BuildRequires: db4-devel
 Prereq: /sbin/chkconfig, grep, textutils, sed, fileutils, sh-utils
 Requires: cleanfeed, bash >= 2.0, inews
 
@@ -63,11 +65,13 @@ local news servers.
 %prep
 %setup -q -a 10
 %patch -p1 -b .rh
+%patch1 -p1
+%patch2 -p1
+perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
+perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
 
 %build
-#libtoolize --copy --force
-#autoreconf
-with_tmp_path=/var/lib/news/tmp ./configure --prefix=/usr  \
+with_tmp_path=/var/lib/news/tmp ./configure --prefix=/usr/lib/news \
 	--sysconfdir=/etc/news --mandir=%{_mandir} \
 	--with-log-dir=/var/log/news --with-spool-dir=/var/spool/news\
 	--with-db-dir=/var/lib/news --with-run-dir=/var/run/news \
@@ -80,7 +84,6 @@ with_tmp_path=/var/lib/news/tmp ./configure --prefix=/usr  \
 perl -pi -e 's/HAVE_DB1_NDBM_H/XXX_HAVE_DB1_NDBM_H/' ./include/config.h
 
 make
-# DBMLIB="" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,7 +98,7 @@ do
 done
 
 mkdir -p $RPM_BUILD_ROOT/etc
-mv $RPM_BUILD_ROOT/usr/bin/rc.news $RPM_BUILD_ROOT/etc
+mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc
 
 touch     $RPM_BUILD_ROOT/var/lib/news/subscriptions
 chmod 644 $RPM_BUILD_ROOT/var/lib/news/subscriptions
@@ -115,8 +118,13 @@ touch $RPM_BUILD_ROOT/var/lib/news/history
 #	-f $RPM_BUILD_ROOT/var/lib/news/history
 #chmod 644 $RPM_BUILD_ROOT/var/lib/news/*
 
+cat > $RPM_BUILD_ROOT/etc/news/.profile <<EOF
+PATH=\$PATH:/usr/lib/news/bin
+export PATH
+EOF
+
 # we get this from cleanfeed
-rm -f $RPM_BUILD_ROOT/usr/bin/filter/filter_innd.pl
+rm -f $RPM_BUILD_ROOT/usr/lib/news/bin/filter/filter_innd.pl
 
 #Fix perms in sample directory to avoid bogus dependencies
 find samples -name "*.in" -exec chmod a-x {} \;
@@ -130,9 +138,9 @@ find $RPM_BUILD_ROOT -type f -or -type l | \
 	sed 's|^/var/lib/news/|%config(noreplace) &|' | \
 	sed 's|.*innshellvar|%config &|' | \
 	sed 's|/var/log/news|%ghost &|' | \
-	sed 's|/usr/bin/inndstart$|%attr(4550,root,news) /usr/bin/inndstart|' | \
-	sed 's|/usr/bin/startinnfeed$|%attr(4550,root,news) /usr/bin/startinnfeed|' | \
-	sed 's|/usr/bin/rnews$|%attr(4550,uucp,news) /usr/bin/rnews|' > files.list
+	sed 's|/usr/lib/news/bin/inndstart$|%attr(4550,root,news) /usr/lib/news/bin/inndstart|' | \
+	sed 's|/usr/lib/news/bin/startinnfeed$|%attr(4550,root,news) /usr/lib/news/bin/startinnfeed|' | \
+	sed 's|/usr/lib/news/bin/rnews$|%attr(4550,uucp,news) /usr/lib/news/bin/rnews|' > files.list
 (echo "%defattr(-,news,news)" ; grep -v inews files.list | \
 	egrep -v "\.(h|so|a|la)$" | \
 	grep -v "news/inn.conf" | \
@@ -197,10 +205,10 @@ exit 0
 
 %files -f files.main
 %defattr(-,news,news)
-%dir /usr/bin/control
-%dir /usr/bin/filter
-%dir /usr/bin/rnews.libexec
-%dir /usr/bin/auth
+%dir /usr/lib/news/bin/control
+%dir /usr/lib/news/bin/filter
+%dir /usr/lib/news/bin/rnews.libexec
+%dir /usr/lib/news/bin/auth
 %dir /etc/news
 %dir /var/spool/news
 %dir /var/spool/news/archive
@@ -227,10 +235,22 @@ exit 0
 %files -n inews
 %defattr(-,root,root)
 %config(noreplace) /etc/news/inn.conf
-%attr(0755,root,root) /usr/bin/inews
+%attr(0755,root,root) /usr/lib/news/bin/inews
 %{_mandir}/man1/inews*
 
 %changelog
+* Thu Jul 18 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- make check if networking is up more robust in initscript
+- move most apps into /usr/lib/news/bin for less namespace pollution
+
+* Tue Jun 18 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- add some cvs patches
+- crude hack to change LOCK_READ and LOCK_WRITE within INN source code
+
+* Mon May 27 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to inn-2.3.3
+- use db4
+
 * Mon Apr 15 2002 Florian La Roche <Florian.LaRoche@redhat.de>
 - put /etc/news/inn.conf into the inews subpackage to make a smaller
   client side possible and require inews from the main inn rpm

diff --git a/innd.init b/innd.init
index 43e8f73..1bec865 100644
--- a/innd.init
+++ b/innd.init
@@ -17,10 +17,10 @@
 . /etc/sysconfig/network
 
 # Check that networking is up.
-[ ${NETWORKING} = "no" ] && exit 0
+[ "${NETWORKING}" = "no" ] && exit 0
 [ -d /etc/news ] || exit 0
 [ -f /etc/news/inn.conf ] || exit 0
-. /usr/lib/innshellvars
+. /usr/lib/news/lib/innshellvars || exit 0
 [ -d "$SPOOLBASE" ] || exit 0
 [ -f "$HISTORY" -a -f "$HISTORY.hash" ] || {
 	echo $"Please run makehistory and/or makedbz before starting innd." >&2

diff --git a/sources b/sources
index 10d61b9..b718394 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-96937a680e290a67019547e1a5e63e43  inn-2.3.2.tar.gz
+97080ce1dcdc5fe8f3dacd230c9d4a0a  inn-2.3.3.tar.gz
 b5e6321446594749eea087c6710eefa5  inn-faq.tar.gz