public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/inn] epel10: - diff patch (fix obsolete version of diff parameter) #137342
@ 2026-08-26 8:05 Martin Stransky
0 siblings, 0 replies; only message in thread
From: Martin Stransky @ 2026-08-26 8:05 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/inn
Branch : epel10
Commit : fd1b8f3c13f867930f37beb61bf6a3eb4e44dac5
Author : Martin Stransky <stransky@fedoraproject.org>
Date : 2004-12-16T13:05:29+00:00
Stats : +188/-16 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/inn/c/fd1b8f3c13f867930f37beb61bf6a3eb4e44dac5?branch=epel10
Log:
- diff patch (fix obsolete version of diff parameter) #137342
- posix/warnings patch #110825
- update to INN 2.4.1
- Thanks to Jochen Schmitt <Jochen@herr-schmitt.de>
---
diff --git a/.cvsignore b/.cvsignore
index bba0269..025569b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
inn-2.3.5.tar.gz
inn-faq.tar.gz
+inn-2.4.1.tar.gz
diff --git a/inn-2.4.1.headusage.patch b/inn-2.4.1.headusage.patch
new file mode 100644
index 0000000..2e8388c
--- /dev/null
+++ b/inn-2.4.1.headusage.patch
@@ -0,0 +1,84 @@
+--- inn-2.4.1/configure.headusage 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/configure 2004-12-13 15:02:02.431918648 +0100
+@@ -8087,7 +8087,7 @@
+ echo "configure:8088: checking for Perl linkage" >&5
+ inn_perl_core_path=`$_PATH_PERL -MConfig -e 'print $Config{archlibexp}'`
+ inn_perl_core_flags=`$_PATH_PERL -MExtUtils::Embed -e ccopts`
+- inn_perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -1`
++ inn_perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -n 1`
+ inn_perl_core_libs=" $inn_perl_core_libs "
+ inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ -lc / /'`
+ for i in $LIBS ; do
+--- inn-2.4.1/faq/part7.html.headusage 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/faq/part7.html 2004-12-13 15:00:53.347421088 +0100
+@@ -1108,7 +1108,7 @@
+ <PRE> A good indicator of your performance characteristics would be how much
+ </PRE>smaller is the number generated by this,
+ <P>
+-<PRE> head -1 /var/news/etc/history.dir | perl -ane 'print 2 ** $F[7], "\n";'
++<PRE> head -n 1 /var/news/etc/history.dir | perl -ane 'print 2 ** $F[7], "\n";'
+ </PRE><P>
+ than the size of your history text file. If it's bigger you're OK. if it's
+ smaller, then lookups for the message ids at the tail of the history text
+@@ -1252,7 +1252,7 @@
+ <P>
+ As noted in the inn FAQ section 7.45, you can check the size of your dbz
+ hash table with the following commands:<BR>
+-<PRE> head -1 history.dir | perl -ane 'print 2 ** $F[7], "\n";'
++<PRE> head -n 1 history.dir | perl -ane 'print 2 ** $F[7], "\n";'
+ </PRE>if the number returned is smaller than your history text file, you are
+ being affected by this problem.<BR>
+ <P>
+--- inn-2.4.1/support/fixscript.in.headusage 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/support/fixscript.in 2004-12-13 14:59:17.620973720 +0100
+@@ -51,7 +51,7 @@
+ exit 1
+ fi
+
+-interpretor=`head -1 "$input"`
++interpretor=`head -n 1 "$input"`
+ case "$interpretor" in
+ */sh|*SH*)
+ path="$SHPATH"
+--- inn-2.4.1/configure.in.headusage 2004-12-13 13:50:42.000000000 +0100
++++ inn-2.4.1/configure.in 2004-12-13 15:03:03.543628256 +0100
+@@ -852,7 +852,7 @@
+ AC_MSG_CHECKING(for Perl linkage)
+ inn_perl_core_path=`$_PATH_PERL -MConfig -e 'print $Config{archlibexp}'`
+ inn_perl_core_flags=`$_PATH_PERL -MExtUtils::Embed -e ccopts`
+- inn_perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -1`
++ inn_perl_core_libs=`$_PATH_PERL -MExtUtils::Embed -e ldopts 2>&1 | tail -n 1`
+ inn_perl_core_libs=" $inn_perl_core_libs "
+ inn_perl_core_libs=`echo "$inn_perl_core_libs" | sed 's/ -lc / /'`
+ for i in $LIBS ; do
+--- inn-2.4.1/backends/actsyncd.in.headusage 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/backends/actsyncd.in 2004-12-13 14:56:43.813356032 +0100
+@@ -53,23 +53,23 @@
+
+ # parse config_file
+ #
+-host="`sed -n -e 's/^host=[ ]*//p' $cfg | tail -1`"
++host="`sed -n -e 's/^host=[ ]*//p' $cfg | tail -n 1`"
+ if [ -z "$host" ]; then
+ echo "$0: no host specified in $cfg" 1>&2
+ exit 3
+ fi
+-flags="`sed -n -e 's/^flags=[ ]*//p' $cfg | tail -1`"
++flags="`sed -n -e 's/^flags=[ ]*//p' $cfg | tail -n 1`"
+ if [ -z "$flags" ]; then
+ echo "$0: no flags specified in $cfg" 1>&2
+ exit 4
+ fi
+-ign="`sed -n -e 's/^ignore_file=[ ]*//p' $cfg | tail -1`"
++ign="`sed -n -e 's/^ignore_file=[ ]*//p' $cfg | tail -n 1`"
+ if [ -z "$ign" ]; then
+ echo "$0: no ignore file specified in $cfg" 1>&2
+ exit 5
+ fi
+-ftp="`sed -n -e 's/^ftppath=[ ]*//p' $cfg | tail -1`"
+-spool="`sed -n -e 's/^spool=[ ]*//p' $cfg | tail -1`"
++ftp="`sed -n -e 's/^ftppath=[ ]*//p' $cfg | tail -n 1`"
++spool="`sed -n -e 's/^spool=[ ]*//p' $cfg | tail -n 1`"
+ if [ -z "$spool" ]; then
+ spool=$SPOOL
+ #echo "$0: no spool directory specified in $cfg" 1>&2
diff --git a/inn-2.4.1.perl.patch b/inn-2.4.1.perl.patch
new file mode 100644
index 0000000..7dfae6b
--- /dev/null
+++ b/inn-2.4.1.perl.patch
@@ -0,0 +1,12 @@
+--- inn-2.4.1/innd/cc.c.perl 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/innd/cc.c 2004-12-13 14:41:04.692124160 +0100
+@@ -1522,6 +1522,9 @@
+ }
+
+
++/* perl.h likes to define strerror, sigh */
++#undef strerror
++
+ /*
+ ** Send a signal to a site's feed.
+ */
diff --git a/inn-2.4.1.pie.patch b/inn-2.4.1.pie.patch
new file mode 100644
index 0000000..3ecd175
--- /dev/null
+++ b/inn-2.4.1.pie.patch
@@ -0,0 +1,37 @@
+--- inn-2.4.1/frontends/Makefile.pie 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/frontends/Makefile 2004-12-13 15:12:09.161681704 +0100
+@@ -79,7 +79,7 @@
+ ovdb_monitor: ovdb_monitor.o $(BOTH) ; $(LINK) ovdb_monitor.o $(STORELIBS)
+ ovdb_server: ovdb_server.o $(BOTH) ; $(LINK) ovdb_server.o $(STORELIBS)
+ ovdb_stat: ovdb_stat.o $(BOTH) ; $(LINK) ovdb_stat.o $(STORELIBS)
+-rnews: rnews.o $(LIBINN) ; $(LINK) rnews.o $(STORELIBS)
++rnews: rnews.o $(LIBINN) ; $(LINK) rnews.o -pie $(STORELIBS)
+ sm: sm.o $(BOTH) ; $(LINK) sm.o $(STORELIBS)
+
+ ovdb_init.o: ovdb_init.c
+--- inn-2.4.1/innfeed/Makefile.pie 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/innfeed/Makefile 2004-12-13 15:14:45.127971224 +0100
+@@ -73,7 +73,7 @@
+ $(FIXSCRIPT) procbatch.in
+
+ startinnfeed: startinnfeed.o $(LIBINN)
+- $(LIBLD) $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
++ $(LIBLD) -pie $(LDFLAGS) -o $@ startinnfeed.o $(LIBINN) $(LIBS)
+
+ # Not normally built.
+ innfeed-convcfg: innfeed-convcfg.in $(FIXSCRIPT)
+--- inn-2.4.1/innd/Makefile.pie 2004-12-13 13:09:57.000000000 +0100
++++ inn-2.4.1/innd/Makefile 2004-12-13 15:16:25.808665432 +0100
+@@ -44,10 +44,10 @@
+ python.o: python.c ; $(CC) $(CFLAGS) $(PYTHONINC) -c python.c
+
+ innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
+- $(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
++ $(LIBLD) -pie $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)
+
+ inndstart: inndstart.o $(LIBINN)
+- $(LIBLD) $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
++ $(LIBLD) -pie $(LDFLAGS) -o $@ inndstart.o $(LIBINN) $(LIBS)
+
+
+ ## Installation rules. Installation commands set in Makefile.global.
diff --git a/inn-2.4.1.posix.patch b/inn-2.4.1.posix.patch
new file mode 100644
index 0000000..410bd19
--- /dev/null
+++ b/inn-2.4.1.posix.patch
@@ -0,0 +1,15 @@
+--- inn-2.4.1/storage/cnfs/cnfs.h.old 2004-12-15 17:38:22.038029888 +0100
++++ inn-2.4.1/storage/cnfs/cnfs.h 2004-12-15 17:38:22.037030040 +0100
+@@ -17,4 +17,12 @@
+ void cnfs_printfiles(FILE *file, TOKEN token, char **xref, int ngroups);
+ void cnfs_shutdown(void);
+
++/* Patch for POSIX
++*/
++#ifndef MADV_SEQUENTIAL
++ #ifdef POSIX_MADV_SEQUENTIAL
++ #define MADV_SEQUENTIAL POSIX_MADV_SEQUENTIAL
++ #endif
++#endif
++
+ #endif
diff --git a/inn.spec b/inn.spec
index f814745..b139639 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.5
-Release: 11.1
+Version: 2.4.1
+Release: 1
License: GPL
Group: System Environment/Daemons
Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
@@ -11,12 +11,14 @@ Source5: inn-cron-rnews
Source7: inn-cron-nntpsend
Source8: innd.init
Source10: inn-faq.tar.gz
-Patch: inn-2.3.1-rh.patch
-Patch2: inn-2.3.3-strerror.patch
-Patch3: inn-headusage.patch
-Patch4: inn-2.3.5-pie.patch
+Patch: inn-2.4.1.rh.patch
+Patch2: inn-2.4.1.perl.patch
+Patch3: inn-2.4.1.headusage.patch
+Patch4: inn-2.4.1.pie.patch
+Patch5: inn-2.4.1.diff.patch
+Patch6: inn-2.4.1.posix.patch
BuildRequires: db4-devel
-Prereq: /sbin/chkconfig, grep, textutils, sed, fileutils, sh-utils
+Prereq: /sbin/chkconfig, grep, coreutils, sed
Requires: bash >= 2.0, inews
# XXX white out bogus perl requirement for now
@@ -64,21 +66,26 @@ Install inews if you need a program for posting Usenet articles to
local news servers.
%prep
-%setup -q -a 10
-%patch -p1 -b .rh
-%patch2 -p1
-%patch3 -p1
+%setup -q -a 10
+%patch -p1 -b .rh
+%patch2 -p1 -b .perl
+%patch3 -p1 -b .headusage
%patch4 -p1 -b .pie
+%patch5 -p1 -b .diff
+%patch6 -p1 -b .posix
perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
%build
+export DEFINE_INN_FLAGS="-D_XOPEN_SOURCE=600 -D_BSD_SOURCE"
+
%ifarch s390 s390x
-export CFLAGS="$RPM_OPT_FLAGS -fPIC"
+export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fPIC"
%else
-export CFLAGS="$RPM_OPT_FLAGS -fpic"
+export CFLAGS="$RPM_OPT_FLAGS $DEFINE_INN_FLAGS -fpic"
%endif
+
with_tmp_path=/var/lib/news/tmp ./configure \
--prefix=/usr/lib/news \
--sysconfdir=/etc/news --mandir=%{_mandir} \
@@ -102,10 +109,16 @@ make install DESTDIR=$RPM_BUILD_ROOT
# -- Install man pages needed by suck et al.
mkdir -p $RPM_BUILD_ROOT/usr/include/inn
-for f in clibrary.h configdata.h config.h dbz.h libinn.h autoconfig.h storage.h
+
+for f in clibrary.h config.h dbz.h libinn.h storage.h
do
install -c -m 0644 ./include/$f $RPM_BUILD_ROOT/usr/include/inn
done
+for f in defines.h system.h
+do
+ install -c -m 0644 ./include/inn/$f $RPM_BUILD_ROOT/usr/include/inn
+done
+
mkdir -p $RPM_BUILD_ROOT/etc
mv $RPM_BUILD_ROOT/usr/lib/news/bin/rc.news $RPM_BUILD_ROOT/etc
@@ -144,12 +157,14 @@ ln -sf ../lib/news/bin/inews $RPM_BUILD_ROOT/usr/bin/inews
ln -sf ../lib/news/bin/rnews $RPM_BUILD_ROOT/usr/bin/rnews
#Build filelist
+rm -rf $RPM_BUILD_ROOT/usr/lib/news/include
echo "%defattr(-,news,news)" > files.list
find $RPM_BUILD_ROOT -type f -or -type l | \
sed -e "s|$RPM_BUILD_ROOT||g" | \
sed 's|^/etc/cron|%config(noreplace) %attr(-,root,root) &|' | \
sed 's|^/etc/rc.d|%config(noreplace) %attr(-,root,root) &|' | \
sed 's|^/etc|%config(noreplace) &|' | \
+ sed 's|^/etc/news|%config(noreplace) %attr(0640,news,news) &|' | \
sed 's|^/var/lib/news/|%config(noreplace) &|' | \
sed 's|.*innshellvar|%config &|' | \
sed 's|/var/log/news|%ghost &|' | \
@@ -240,7 +255,7 @@ exit 0
%dir /var/run/news
%defattr(-,root,root)
%{_mandir}/man[158]/*
-%doc NEWS README* ChangeLog CONTRIBUTORS LICENSE HISTORY INSTALL
+%doc NEWS README* ChangeLog CONTRIBUTORS LICENSE INSTALL
%doc %dir samples
%files devel -f files.devel
@@ -255,6 +270,14 @@ exit 0
%{_mandir}/man1/inews*
%changelog
+* Wed Dec 15 2004 Martin Stransky <stransky@redhat.com> 2.4.1-1
+- diff patch (fix obsolete version of diff parameter) #137342
+- posix/warnings patch #110825
+
+* Mon Dec 13 2004 Martin Stransky <stransky@redhat.com> 2.4.1-1
+- update to INN 2.4.1
+- Thanks to Jochen Schmitt <Jochen@herr-schmitt.de>
+
* Tue Oct 5 2004 Thomas Woerner <twoerner@redhat.com> 2.3.5-11.1
- using runuser instead of su in cronjobs
diff --git a/sources b/sources
index 98a4815..c594dc3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-97223e05d37e568f2ba95793b8133246 inn-2.3.5.tar.gz
b5e6321446594749eea087c6710eefa5 inn-faq.tar.gz
+bec635b6e70188071fdb539cd374f2ba inn-2.4.1.tar.gz
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-26 8:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-26 8:05 [rpms/inn] epel10: - diff patch (fix obsolete version of diff parameter) #137342 Martin Stransky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox