[inn/f21] New upstream release.
Jochen Schmitt
s4504kr at fedoraproject.org
Sat Jul 19 15:08:51 UTC 2014
commit 6be207bbcb1d75869707b17a386f7336a3f4c205
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue Jul 15 20:04:09 2014 +0200
New upstream release.
.gitignore | 1 +
inn-2.5.1-nologinshell.patch | 71 ------------
inn-2.5.2-smp.patch | 30 -----
inn-2.5.3-flex.patch | 12 --
inn-2.5.3-pod.patch | 55 ---------
inn-2.5.3-radius.patch | 130 ----------------------
inn-2.5.4-doc.patch | 53 +++++++++
inn-2.5.2-docrun.patch => inn-2.5.4-docrun.patch | 25 +++-
inn.spec | 32 +++---
sources | 2 +-
10 files changed, 89 insertions(+), 322 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 574c8af..e7c5a5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
inn-2.5.2.tar.gz
inn-faq.tar.gz
/inn-2.5.3.tar.gz
+/inn-2.5.4.tar.gz
diff --git a/inn-2.5.4-doc.patch b/inn-2.5.4-doc.patch
new file mode 100644
index 0000000..0798372
--- /dev/null
+++ b/inn-2.5.4-doc.patch
@@ -0,0 +1,53 @@
+diff -up inn-2.5.4/doc/man/rc.news.8.nologin inn-2.5.4/doc/man/rc.news.8
+--- inn-2.5.4/doc/man/rc.news.8.nologin 2014-07-15 16:43:15.740639916 +0200
++++ inn-2.5.4/doc/man/rc.news.8 2014-07-15 17:06:18.214533242 +0200
+@@ -177,20 +177,20 @@ is recommended to throttle the server fi
+ To start \s-1INN\s0 and leave certain error messages going to the terminal:
+ .PP
+ .Vb 1
+-\& su \- news \-s /bin/sh \-c <pathbin in inn.conf>/rc.news
++\& su \- news \-s /bin/sh \-c /usr/libexec/news/rc.news
+ .Ve
+ .PP
+ To run \s-1INN\s0 at startup time from appropriate system boot scripts:
+ .PP
+ .Vb 1
+-\& su \- news \-s /bin/sh \-c <pathbin>/rc.news >/dev/console
++\& su \- news \-s /bin/sh \-c /usr/libexec/news/rc.news >/dev/console
+ .Ve
+ .PP
+ To stop \s-1INN\s0 (throttling first):
+ .PP
+ .Vb 2
+-\& <pathbin>/ctlinnd throttle reason
+-\& su \- news \-s /bin/sh \-c \*(Aq<pathbin>/rc.news stop\*(Aq
++\& /usr/libexec/news/ctlind throttle reason
++\& su \- news \-s /bin/sh \-c \*(Aq/usr/libexec/news/rc.news stop\*(Aq
+ .Ve
+ .SH "BUGS"
+ .IX Header "BUGS"
+diff -up inn-2.5.4/doc/pod/install.pod.nologin inn-2.5.4/doc/pod/install.pod
+diff -up inn-2.5.4/doc/pod/rc.news.pod.nologin inn-2.5.4/doc/pod/rc.news.pod
+--- inn-2.5.4/doc/pod/rc.news.pod.nologin 2014-07-15 16:43:15.742639849 +0200
++++ inn-2.5.4/doc/pod/rc.news.pod 2014-07-15 17:09:19.267569754 +0200
+@@ -67,16 +67,16 @@ is recommended to throttle the server fi
+
+ To start INN and leave certain error messages going to the terminal:
+
+- su - news -s /bin/sh -c <pathbin in inn.conf>/rc.news
++ su - news -s /bin/sh -c /usr/libexec/news/rc.news
+
+ To run INN at startup time from appropriate system boot scripts:
+
+- su - news -s /bin/sh -c <pathbin>/rc.news >/dev/console
++ su - news -s /bin/sh -c /usr/libexec/news/rc.news >/dev/console
+
+ To stop INN (throttling first):
+
+- <pathbin>/ctlinnd throttle reason
+- su - news -s /bin/sh -c '<pathbin>/rc.news stop'
++ /usr/libexec/news/ctlinnd throttle reason
++ su - news -s /bin/sh -c '</usr/libexec/news/rc.news stop'
+
+ =head1 BUGS
+
diff --git a/inn-2.5.2-docrun.patch b/inn-2.5.4-docrun.patch
similarity index 60%
rename from inn-2.5.2-docrun.patch
rename to inn-2.5.4-docrun.patch
index bd113d3..a5b2f16 100644
--- a/inn-2.5.2-docrun.patch
+++ b/inn-2.5.4-docrun.patch
@@ -1,7 +1,20 @@
-diff -up inn-2.5.2/doc/FAQ.docrun inn-2.5.2/doc/FAQ
---- inn-2.5.2/doc/FAQ.docrun 2011-05-31 19:40:51.246525680 +0200
-+++ inn-2.5.2/doc/FAQ 2011-05-31 19:41:32.173525676 +0200
-@@ -988,7 +988,7 @@ pathetc: /usr/local/news/etc
+diff -up inn-2.5.4/doc/FAQ.docrun inn-2.5.4/doc/FAQ
+--- inn-2.5.4/doc/FAQ.docrun 2014-05-17 10:24:49.000000000 +0200
++++ inn-2.5.4/doc/FAQ 2014-07-15 17:39:20.616375124 +0200
+@@ -980,16 +980,16 @@ common packages.
+
+ (Data courtesy of John F. Morse.)
+
+- DEFAULT DEBIAN
+-pathnews: /usr/local/news /usr/lib/news
+-pathbin: /usr/local/news/bin /usr/lib/news/bin
+-pathcontrol: /usr/local/news/bin/control /usr/lib/news/bin/control
++ DEFAULT Fedora
++pathnews: /usr/local/news /usr/lib/execenews
++pathbin: /usr/local/news/bin /usr/libexec/news
++pathcontrol: /usr/local/news/bin/control /usr/libexec/news/control
+ pathdb: /usr/local/news/db /var/lib/news
+ pathetc: /usr/local/news/etc /etc/news
pathfilter: /usr/local/news/bin/filter /etc/news/filter
pathhttp: /usr/local/news/log /var/log/news
pathlog: /usr/local/news/log /var/log/news
@@ -10,7 +23,7 @@ diff -up inn-2.5.2/doc/FAQ.docrun inn-2.5.2/doc/FAQ
pathtmp: /usr/local/news/tmp /var/spool/news/incoming/tmp
pathspool: /usr/local/news/spool /var/spool/news
patharchive: /usr/local/news/spool/archive /var/spool/news/archive
-@@ -1006,7 +1006,7 @@ pathetc: /usr/local/news/etc
+@@ -1007,7 +1007,7 @@ pathetc: /usr/local/news/etc
pathfilter: /usr/local/news/bin/filter /usr/lib/news/bin/filter
pathhttp: /usr/local/news/log /var/log/news
pathlog: /usr/local/news/log /var/log/news
@@ -19,7 +32,7 @@ diff -up inn-2.5.2/doc/FAQ.docrun inn-2.5.2/doc/FAQ
pathtmp: /usr/local/news/tmp /var/lib/news/tmp
pathspool: /usr/local/news/spool /var/spool/news
patharchive: /usr/local/news/spool/archive /var/spool/news/archive
-@@ -1024,7 +1024,7 @@ pathetc: /usr/local/news/etc
+@@ -1025,7 +1025,7 @@ pathetc: /usr/local/news/etc
pathfilter: /usr/local/news/bin/filter /usr/lib/news/bin/filter
pathhttp: /usr/local/news/log /var/log/news
pathlog: /usr/local/news/log /var/log/news
diff --git a/inn.spec b/inn.spec
index eed8218..7db3cda 100644
--- a/inn.spec
+++ b/inn.spec
@@ -2,8 +2,8 @@
Summary: The InterNetNews system, an Usenet news server
Name: inn
-Version: 2.5.3
-Release: 19%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -23,16 +23,12 @@ Patch4: inn-2.5.1.pie.patch
Patch6: inn-2.5.2.posix.patch
Patch7: inn-2.4.3.warn.patch
Patch8: inn-2.4.2-makedbz.patch
-Patch10: inn-2.5.1-nologinshell.patch
+Patch10: inn-2.5.4-doc.patch
Patch13: inn-2.5.0-chown.patch
Patch14: inn-redhat_build.patch
Patch15: inn-shared.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
-Patch21: inn-2.5.3-radius.patch
-Patch22: inn-2.5.3-pod.patch
+Patch19: inn-2.5.4-docrun.patch
BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
BuildRequires: perl(ExtUtils::Embed) flex systemd-units
Requires(pre): shadow-utils
@@ -109,16 +105,12 @@ exit 0
%patch6 -p1 -b .posix
%patch7 -p1 -b .warn
%patch8 -p1 -b .makedbz
-%patch10 -p1 -b .nologin
+%patch10 -p1 -b .docx
%patch13 -p1 -b .chown
%patch14 -p1 -b .redhat_build
%patch15 -p1 -b .shared
%patch17 -p1 -b .pfix
-%patch18 -p1 -b .smp
%patch19 -p1 -b .docrun
-%patch20 -p1 -b .lex
-%patch21 -p1 -b .radius
-%patch22 -p1 -b .pdx
perl -pi -e 's/su news/su -m news/' ./INSTALL
perl -pi -e 's/LOCK_READ/LLOCK_READ/' `find . -type f`
@@ -223,7 +215,6 @@ D %{_localstatedir}/run/news 0755 news news -
EOF
install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/news
-mv samples/radius.conf samples/inn-radius.conf
%post
su -m news -c '/usr/libexec/news/makedbz -i -o'
@@ -262,7 +253,7 @@ if [ -f /etc/rsyslog.conf ]; then
>> /etc/rsyslog.conf
echo 'news.=crit /var/log/news/news.crit' >> /etc/rsyslog.conf
echo 'news.=err /var/log/news/news.err' >> /etc/rsyslog.conf
- echo 'news.notice /var/log/news/news.notice' >> /etc/rsyslog.conf
+e echo 'news.notice /var/log/news/news.notice' >> /etc/rsyslog.conf
echo 'news.=debug /var/log/news/news.debug' >> /etc/rsyslog.conf
fi
@@ -297,6 +288,10 @@ fi
%preun
%systemd_preun innd.service
+%systemd_preun innd-expire.service
+%systemd_preun innd-nntpsend.service
+%systemd_preun innd-rnews.service
+
%systemd_preun innd-expire.timer
%systemd_preun innd-nntpsend.timer
%systemd_preun innd-rnews.timer
@@ -337,8 +332,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.innd
-%config(noreplace) %{_sysconfdir}/news/motd.nnrpd
+%config(noreplace) %{_sysconfdir}/news/motd.innd.sample
+%config(noreplace) %{_sysconfdir}/news/motd.nnrpd.sample
%config(noreplace) %{_sysconfdir}/news/expire.ctl
%config(noreplace) %{_sysconfdir}/news/actsync.ign
%config(noreplace) %{_sysconfdir}/news/innreport.conf
@@ -558,6 +553,9 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Tue Jul 15 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.4-1
+- New upstream release
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index f77cbb8..4847fd6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
+ad9f77a1c84c668ccd268792721a2215 inn-2.5.4.tar.gz
6c0a3600167940e6c0f5771ede22648b inn-faq.tar.gz
-353fe95232828ddbc80debff86c240bc inn-2.5.3.tar.gz
More information about the scm-commits
mailing list