[inn/f18] new upstream release 2.5.3
Jochen Schmitt
s4504kr at fedoraproject.org
Tue Sep 11 14:17:21 UTC 2012
commit 8159dd71f3c00ac85edfa8df1f4c1296e58dcdaa
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Thu Sep 6 09:42:49 2012 +0200
new upstream release 2.5.3
.gitignore | 1 +
inn-2.4.3.rh.patch | 36 ++++++++++++++++++------------------
inn-2.5.1-nologinshell.patch | 25 ++-----------------------
inn-2.5.2-docrun.patch | 18 ------------------
inn-2.5.2-hdr.patch | 23 -----------------------
inn-2.5.2-pconf.patch | 2 +-
inn-2.5.3-flex.patch | 12 ++++++++++++
inn-shared.patch | 4 +---
inn.spec | 20 +++++++++++++++-----
sources | 2 +-
10 files changed, 51 insertions(+), 92 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2450ebb..574c8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
inn-2.5.2.tar.gz
inn-faq.tar.gz
+/inn-2.5.3.tar.gz
diff --git a/inn-2.4.3.rh.patch b/inn-2.4.3.rh.patch
index 2b1a13c..94fd673 100644
--- a/inn-2.4.3.rh.patch
+++ b/inn-2.4.3.rh.patch
@@ -51,29 +51,29 @@
--- inn-2.4.1/samples/inn.conf.in.old 2004-12-13 13:09:57.000000000 +0100
+++ inn-2.4.1/samples/inn.conf.in 2004-12-13 13:31:12.475437968 +0100
@@ -21,7 +21,7 @@
- organization: "A poorly-installed InterNetNews site"
- ovmethod: tradindexed
- hismethod: hisv6
--pathhost: @HOSTNAME@
-+#pathhost: localhost
- pathnews: @prefix@
+ organization: "A poorly-installed InterNetNews site"
+ ovmethod: tradindexed
+ hismethod: hisv6
+-pathhost: @HOSTNAME@
++#pathhost: localhost
+ pathnews: @prefix@
#runasuser:
@@ -122,7 +122,7 @@
# Monitoring
--doinnwatch: true
-+doinnwatch: false
- innwatchbatchspace: 4000
- innwatchlibspace: 25000
- innwatchloload: 1000
+-doinnwatch: true
++doinnwatch: false
+ innwatchbatchspace: 4000
+ innwatchlibspace: 25000
+ innwatchloload: 1000
@@ -157,7 +157,7 @@
- keepmmappedthreshold: 1024
+ keepmmappedthreshold: 1024
#maxcmdreadsize:
- maxforks: 10
--nicekids: 4
-+nicekids: 0
- nicenewnews: 0
- nicennrpd: 0
- pauseretrytime: 300
+ maxforks: 10
+-nicekids: 4
++nicekids: 0
+ nicenewnews: 0
+ nicennrpd: 0
+ pauseretrytime: 300
diff --git a/inn-2.5.1-nologinshell.patch b/inn-2.5.1-nologinshell.patch
index d79a0c6..cf3d55e 100644
--- a/inn-2.5.1-nologinshell.patch
+++ b/inn-2.5.1-nologinshell.patch
@@ -44,8 +44,8 @@ diff -up inn-2.5.1/doc/pod/install.pod.nologin inn-2.5.1/doc/pod/install.pod
- su news -c '<pathbin in inn.conf>/rc.news stop'
+ su -m news -c '/etc/rc.news stop'
- In the F<contrib> directory of this source tree is a sample init script
- for people using System V-style init.d directories.
+ In the F<contrib> directory of this source tree, two sample init scripts are provided: one
+ for people using System V-style init.d directories, and another for people
diff -up inn-2.5.1/doc/pod/rc.news.pod.nologin inn-2.5.1/doc/pod/rc.news.pod
--- inn-2.5.1/doc/pod/rc.news.pod.nologin 2009-10-12 20:24:04.000000000 +0200
+++ inn-2.5.1/doc/pod/rc.news.pod 2009-10-13 21:53:35.000000000 +0200
@@ -69,24 +69,3 @@ diff -up inn-2.5.1/doc/pod/rc.news.pod.nologin inn-2.5.1/doc/pod/rc.news.pod
=head1 BUGS
-diff -up inn-2.5.1/INSTALL.nologin inn-2.5.1/INSTALL
---- inn-2.5.1/INSTALL.nologin 2009-10-12 20:24:04.000000000 +0200
-+++ inn-2.5.1/INSTALL 2009-10-13 21:53:35.000000000 +0200
-@@ -1511,7 +1511,7 @@ Starting and Stopping the System
- news user and not as root. To start INN on system boot, you therefore
- want to put something like:
-
-- su news -c <pathbin in inn.conf>/rc.news
-+ su -m news -c /etc/rc.news
-
- in the system boot scripts. If innd is stopped or killed, you can
- restart it by running rc.news by hand as the news user.
-@@ -1519,7 +1519,7 @@ Starting and Stopping the System
- The rc.news script may also be used to shut down INN, with the "stop"
- option:
-
-- su news -c '<pathbin in inn.conf>/rc.news stop'
-+ su -m news -c '/etc/rc.news stop'
-
- In the contrib directory of this source tree is a sample init script for
- people using System V-style init.d directories.
diff --git a/inn-2.5.2-docrun.patch b/inn-2.5.2-docrun.patch
index 8a0ca60..bd113d3 100644
--- a/inn-2.5.2-docrun.patch
+++ b/inn-2.5.2-docrun.patch
@@ -28,21 +28,3 @@ diff -up inn-2.5.2/doc/FAQ.docrun inn-2.5.2/doc/FAQ
pathtmp: /usr/local/news/tmp /usr/tmp
pathspool: /usr/local/news/spool /var/spool/news
patharchive: /usr/local/news/spool/archive /var/spool/news/archive
-diff -up inn-2.5.2/doc/man/innfeed.1.docrun inn-2.5.2/doc/man/innfeed.1
---- inn-2.5.2/doc/man/innfeed.1.docrun 2011-05-31 19:41:45.972525674 +0200
-+++ inn-2.5.2/doc/man/innfeed.1 2011-05-31 19:42:30.722525668 +0200
-@@ -127,12 +127,12 @@ will close the file and open the new fil
- .PP
- .RS
- .nf
--innfeed -p /var/run/news/innfeed.pid my-funnel-file &
-+innfeed -p /run/news/innfeed.pid my-funnel-file &
- while true; do
- sleep 43200
- rm -f my-funnel-file
- ctlinnd flush funnel-file-site
-- kill -ALRM `cat /var/run/news/innfeed.pid`
-+ kill -ALRM `cat /run/news/innfeed.pid`
- done
- .fi
- .RE
diff --git a/inn-2.5.2-pconf.patch b/inn-2.5.2-pconf.patch
index bac608d..c04d7f9 100644
--- a/inn-2.5.2-pconf.patch
+++ b/inn-2.5.2-pconf.patch
@@ -7,6 +7,6 @@ diff -up inn-2.5.2/perl/INN/Config.pm.in.pfix inn-2.5.2/perl/INN/Config.pm.in
my @INNCONFVAR = ();
-my @values = `${exec_prefix}/bin/innconfval -p`;
+my @values = `${exec_prefix}/innconfval -p`;
- foreach $line (@values) {
+ foreach my $line (@values) {
eval 'our '.$line;
if ($line =~ /^(.*?) = /m) {
diff --git a/inn-2.5.3-flex.patch b/inn-2.5.3-flex.patch
new file mode 100644
index 0000000..aa359c8
--- /dev/null
+++ b/inn-2.5.3-flex.patch
@@ -0,0 +1,12 @@
+diff -up inn-2.5.3/innfeed/configfile.l.lex inn-2.5.3/innfeed/configfile.l
+--- inn-2.5.3/innfeed/configfile.l.lex 2012-09-11 14:29:00.473000388 +0200
++++ inn-2.5.3/innfeed/configfile.l 2012-09-11 14:29:40.108999869 +0200
+@@ -36,7 +36,7 @@ static void yyunput(int, char *) UNUSED;
+ int yyget_lineno(void);
+ FILE *yyget_in(void);
+ FILE *yyget_out(void);
+-int yyget_leng(void);
++// int yyget_leng(void);
+ char *yyget_text(void);
+ int yyget_debug(void);
+ void yyset_lineno(int);
diff --git a/inn-shared.patch b/inn-shared.patch
index 4dad12b..07cbaa4 100644
--- a/inn-shared.patch
+++ b/inn-shared.patch
@@ -1,7 +1,7 @@
diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buffindexed/ovmethod.mk
--- inn-2.5.1/storage/buffindexed/ovmethod.mk.shared 2009-12-01 16:50:37.174811272 +0100
+++ inn-2.5.1/storage/buffindexed/ovmethod.mk 2009-12-01 16:53:24.914809560 +0100
-@@ -1,9 +1,9 @@
+@@ -1,8 +1,8 @@
# This rule requires a compiler that supports -o with -c. Since it's normally
# used by developers, that should be acceptable.
-buffindexed/buffindexed_d.o: buffindexed/buffindexed.c
@@ -11,10 +11,8 @@ diff -up inn-2.5.1/storage/buffindexed/ovmethod.mk.shared inn-2.5.1/storage/buff
-buffindexed/buffindexed_d: buffindexed/buffindexed_d.o libstorage.$(EXTLIB) $(LIBHIST)
- $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.o \
-- buffindexed/shmem.o expire.o ov.o \
+buffindexed/buffindexed_d: buffindexed/buffindexed_d.$(EXTOBJ) libstorage.$(EXTLIB) $(LIBHIST)
+ $(LIBLD) $(LDFLAGS) -o $@ buffindexed/buffindexed_d.$(EXTOBJ) \
-+ buffindexed/shmem.$(EXTOBJ) expire.$(EXTOBJ) ov.$(EXTOBJ) \
$(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
diff -up inn-2.5.1/storage/tradindexed/ovmethod.mk.shared inn-2.5.1/storage/tradindexed/ovmethod.mk
--- inn-2.5.1/storage/tradindexed/ovmethod.mk.shared 2009-12-01 16:53:35.644811390 +0100
diff --git a/inn.spec b/inn.spec
index ef3a2eb..e534111 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,7 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.5.2
-Release: 23%{?dist}
+Version: 2.5.3
+Release: 1%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -22,10 +22,10 @@ Patch10: inn-2.5.1-nologinshell.patch
Patch13: inn-2.5.0-chown.patch
Patch14: inn-redhat_build.patch
Patch15: inn-shared.patch
-Patch16: inn-2.5.2-hdr.patch
patch17: inn-2.5.2-pconf.patch
Patch18: inn-2.5.2-smp.patch
Patch19: inn-2.5.2-docrun.patch
+Patch20: inn-2.5.3-flex.patch
BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
BuildRequires: perl(ExtUtils::Embed) flex systemd-units
Requires(pre): shadow-utils
@@ -106,11 +106,12 @@ exit 0
%patch13 -p1 -b .chown
%patch14 -p1 -b .redhat_build
%patch15 -p1 -b .shared
-%patch16 -p1 -b .hdr
%patch17 -p1 -b .pfix
%patch18 -p1 -b .smp
%patch19 -p1 -b .docrun
+%patch20 -p1 -b .lex
+perl -pi -e 's/su news/su -m news/' ./INSTALL
perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
perl -pi -e 's/LOCK_WRITE/LLOCK_WRITE/' `find . -type f`
@@ -309,7 +310,8 @@ fi
%config(noreplace) %{_sysconfdir}/news/passwd.nntp
%config(noreplace) %{_sysconfdir}/news/send-uucp.cf
%config(noreplace) %{_sysconfdir}/news/actsync.cfg
-%config(noreplace) %{_sysconfdir}/news/motd.news
+%config(noreplace) %{_sysconfdir}/news/motd.innd
+%config(noreplace) %{_sysconfdir}/news/motd.nnrpd
%config(noreplace) %{_sysconfdir}/news/expire.ctl
%config(noreplace) %{_sysconfdir}/news/actsync.ign
%config(noreplace) %{_sysconfdir}/news/innreport.conf
@@ -344,6 +346,10 @@ fi
%config(noreplace) %{_sharedstatedir}/news/subscriptions
%config(noreplace) %{_sharedstatedir}/news/history
+%config(noreplace) %{_sysconfdir}/news/innshellvars.pl.local
+%config(noreplace) %{_sysconfdir}/news/innshellvars.local
+%config(noreplace) %{_sysconfdir}/news/innshellvars.tcl.local
+
%defattr(0755,root,news,-)
%dir %{_libexecdir}/news
%{_libexecdir}/news/controlbatch
@@ -475,6 +481,7 @@ fi
%dir %{perl_vendorlib}/INN
%{perl_vendorlib}/INN/Config.pm
+%{perl_vendorlib}/INN/Utils/Shlock.pm
%defattr(-,news,news,-)
%dir /var/spool/news
@@ -524,6 +531,9 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Tue Sep 11 2012 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-1
+- new upstream release 2.5.3
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sources b/sources
index b220cf0..f77cbb8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a6e577dceb90d07501b96149508b974b inn-2.5.2.tar.gz
6c0a3600167940e6c0f5771ede22648b inn-faq.tar.gz
+353fe95232828ddbc80debff86c240bc inn-2.5.3.tar.gz
More information about the scm-commits
mailing list