[inn/f19] Building package with PIE flags (#965502)
Jochen Schmitt
s4504kr at fedoraproject.org
Wed May 22 17:11:16 UTC 2013
commit 275a8c76fa1d65ae13eb48b96e78f373606d9be8
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Tue May 21 18:46:33 2013 +0200
Building package with PIE flags (#965502)
inn-2.5.3-pod.patch | 55 ++++++++++++++++++++
inn-2.5.3-radius.patch | 130 ++++++++++++++++++++++++++++++++++++++++++++++++
inn.spec | 10 +++-
3 files changed, 194 insertions(+), 1 deletions(-)
---
diff --git a/inn-2.5.3-pod.patch b/inn-2.5.3-pod.patch
new file mode 100644
index 0000000..8a920de
--- /dev/null
+++ b/inn-2.5.3-pod.patch
@@ -0,0 +1,55 @@
+diff -up inn-2.5.3/control/pgpverify.in.pdx inn-2.5.3/control/pgpverify.in
+--- inn-2.5.3/control/pgpverify.in.pdx 2013-05-22 18:45:57.132464138 +0200
++++ inn-2.5.3/control/pgpverify.in 2013-05-22 18:47:39.056806362 +0200
+@@ -738,19 +738,19 @@ B<pgpverify> may exit with the following
+
+ The control message had a good PGP signature.
+
+-=item 1
++=item Z<>1
+
+ The control message had no PGP signature.
+
+-=item 2
++=item Z<>2
+
+ The control message had an unknown PGP signature.
+
+-=item 3
++=item Z<>3
+
+ The control message had a bad PGP signature.
+
+-=item 255
++=item Z<>255
+
+ A problem occurred not directly related to PGP analysis of signature.
+
+diff -up inn-2.5.3/doc/pod/actsync.pod.pdx inn-2.5.3/doc/pod/actsync.pod
+--- inn-2.5.3/doc/pod/actsync.pod.pdx 2013-05-22 18:42:30.275978028 +0200
++++ inn-2.5.3/doc/pod/actsync.pod 2013-05-22 18:42:30.281977635 +0200
+@@ -529,20 +529,20 @@ level as follows:
+
+ No debug or status reports (default).
+
+-=item 1
++=item Z<>1
+
+ Print summary, but only if work was needed or done.
+
+-=item 2
++=item Z<>2
+
+ Print actions, exec output, and summary, but only if work was needed or
+ done.
+
+-=item 3
++=item Z<>3
+
+ Print actions, exec output, and summary.
+
+-=item 4
++=item Z<>4
+
+ Full debug output.
+
diff --git a/inn-2.5.3-radius.patch b/inn-2.5.3-radius.patch
new file mode 100644
index 0000000..3e4117f
--- /dev/null
+++ b/inn-2.5.3-radius.patch
@@ -0,0 +1,130 @@
+diff -up inn-2.5.3/doc/man/Makefile.radius inn-2.5.3/doc/man/Makefile
+--- inn-2.5.3/doc/man/Makefile.radius 2013-02-24 16:27:53.340492703 +0100
++++ inn-2.5.3/doc/man/Makefile 2013-02-24 16:27:53.353491839 +0100
+@@ -18,7 +18,7 @@ SEC5 = active.5 active.times.5 buffindex
+ cycbuff.conf.5 distrib.pats.5 distributions.5 expire.ctl.5 history.5 incoming.conf.5 \
+ inn.conf.5 innfeed.conf.5 innwatch.ctl.5 moderators.5 motd.news.5 \
+ newsfeeds.5 newsgroups.5 newslog.5 nnrpd.track.5 nntpsend.ctl.5 ovdb.5 \
+- passwd.nntp.5 radius.conf.5 readers.conf.5 \
++ passwd.nntp.5 inn-radius.conf.5 readers.conf.5 \
+ storage.conf.5 subscriptions.5
+
+ SEC8 = actsync.8 archive.8 batcher.8 buffchan.8 ckpasswd.8 \
+diff -up inn-2.5.3/doc/pod/Makefile.radius inn-2.5.3/doc/pod/Makefile
+--- inn-2.5.3/doc/pod/Makefile.radius 2013-02-24 16:27:53.370490710 +0100
++++ inn-2.5.3/doc/pod/Makefile 2013-02-24 16:27:53.382489913 +0100
+@@ -25,7 +25,7 @@ MAN5 = ../man/active.5 ../man/active.tim
+ ../man/inn.conf.5 ../man/innfeed.conf.5 ../man/moderators.5 \
+ ../man/motd.news.5 ../man/newsfeeds.5 ../man/newsgroups.5 \
+ ../man/newslog.5 ../man/nntpsend.ctl.5 ../man/ovdb.5 \
+- ../man/passwd.nntp.5 ../man/radius.conf.5 ../man/readers.conf.5 \
++ ../man/passwd.nntp.5 ../man/inn-radius.conf.5 ../man/readers.conf.5 \
+ ../man/storage.conf.5 ../man/subscriptions.5
+
+ MAN8 = ../man/actsync.8 ../man/archive.8 ../man/auth_krb5.8 \
+@@ -106,7 +106,7 @@ maintclean: distclean
+ ../man/nntpsend.ctl.5: nntpsend.ctl.pod ; $(POD2MAN) -s 5 $? > $@
+ ../man/ovdb.5: ovdb.pod ; $(POD2MAN) -s 5 $? > $@
+ ../man/passwd.nntp.5: passwd.nntp.pod ; $(POD2MAN) -s 5 $? > $@
+-../man/radius.conf.5: radius.conf.pod ; $(POD2MAN) -s 5 $? > $@
++../man/inn-radius.conf.5: radius.conf.pod ; $(POD2MAN) -s 5 $? > $@
+ ../man/readers.conf.5: readers.conf.pod ; $(POD2MAN) -s 5 $? > $@
+ ../man/storage.conf.5: storage.conf.pod ; $(POD2MAN) -s 5 $? > $@
+ ../man/subscriptions.5: subscriptions.pod ; $(POD2MAN) -s 5 $? > $@
+diff -up inn-2.5.3/doc/pod/news.pod.radius inn-2.5.3/doc/pod/news.pod
+--- inn-2.5.3/doc/pod/news.pod.radius 2013-02-24 16:27:53.368490843 +0100
++++ inn-2.5.3/doc/pod/news.pod 2013-02-24 16:27:53.367490909 +0100
+@@ -1459,7 +1459,7 @@ detailed documentation has also been wri
+ =item *
+
+ The RADIUS configuration is now wrapped in a C<server {}> block in
+-F<radius.conf>.
++F<inn-radius.conf>.
+
+ =item *
+
+diff -up inn-2.5.3/doc/pod/radius.conf.pod.radius inn-2.5.3/doc/pod/radius.conf.pod
+--- inn-2.5.3/doc/pod/radius.conf.pod.radius 2013-02-24 16:27:53.372490577 +0100
++++ inn-2.5.3/doc/pod/radius.conf.pod 2013-02-24 16:27:53.372490577 +0100
+@@ -1,13 +1,13 @@
+ =head1 NAME
+
+-radius.conf - Configuration for nnrpd RADIUS authenticator
++inn-radius.conf - Configuration for nnrpd RADIUS authenticator
+
+ =head1 DESCRIPTION
+
+ This describes the format and attributes of the configuration file for the
+ nnrpd RADIUS authenticator. See radius(1) for more information about the
+ authenticator program. The default location for this file is
+-F<radius.conf> in I<pathetc>.
++F<inn-radius.conf> in I<pathetc>.
+
+ Blank lines and lines beginning with C<#> are ignored, as is anything
+ after a C<#> on a line. All other lines should begin with a parameter
+@@ -98,7 +98,7 @@ The shared secret with the RADIUS server
+ =head1 HISTORY
+
+ This documentation was written by Russ Allbery <rra at stanford.edu> based on
+-the comments in the sample F<radius.conf> file by Yury S<B. Razbegin>.
++the comments in the sample F<inn-radius.conf> file by Yury S<B. Razbegin>.
+
+ $Id: radius.conf.pod 8200 2008-11-30 13:31:30Z iulius $
+
+diff -up inn-2.5.3/doc/pod/radius.pod.radius inn-2.5.3/doc/pod/radius.pod
+--- inn-2.5.3/doc/pod/radius.pod.radius 2013-02-24 16:27:53.386489647 +0100
++++ inn-2.5.3/doc/pod/radius.pod 2013-02-24 16:27:53.383489846 +0100
+@@ -16,9 +16,9 @@ authenticator. It is useful for a site
+ authentication via RADIUS and wants to authenticate news reading
+ connections as well.
+
+-By default, B<radius> reads I<pathetc>/radius.conf for configuration
++By default, B<radius> reads I<pathetc>/inn-radius.conf for configuration
+ information, but a different configuration file can be specified with
+-B<-f>. See radius.conf(5) for a description of the configuration file.
++B<-f>. See inn-radius.conf(5) for a description of the configuration file.
+
+ =head1 OPTIONS
+
+@@ -26,7 +26,7 @@ B<-f>. See radius.conf(5) for a descrip
+
+ =item B<-f> I<config>
+
+-Read I<config> instead of I<pathetc>/radius.conf for configuration
++Read I<config> instead of I<pathetc>/inn-radius.conf for configuration
+ information.
+
+ =item B<-h>
+@@ -70,7 +70,7 @@ $Id: radius.pod 7664 2007-09-02 12:58:07
+
+ =head1 SEE ALSO
+
+-nnrpd(8), radius.conf(5), readers.conf(5)
++nnrpd(8), inn-radius.conf(5), readers.conf(5)
+
+ S<RFC 2865>, Remote Authentication Dial In User Service.
+
+diff -up inn-2.5.3/include/inn/paths.h.in.radius inn-2.5.3/include/inn/paths.h.in
+--- inn-2.5.3/include/inn/paths.h.in.radius 2013-02-24 16:27:53.201501936 +0100
++++ inn-2.5.3/include/inn/paths.h.in 2013-02-24 16:27:53.203501803 +0100
+@@ -68,7 +68,7 @@
+ #define INN_PATH_MOTD_INND "motd.innd"
+ #define INN_PATH_MOTD_NNRPD "motd.nnrpd"
+ #define INN_PATH_STORAGECTL "storage.conf"
+-#define INN_PATH_RADIUS_CONFIG "radius.conf"
++#define INN_PATH_RADIUS_CONFIG "inn-radius.conf"
+ #define INN_PATH_FILESYSTEMS "filesystems"
+
+ /* Default prefix path is pathspool. */
+diff -up inn-2.5.3/site/Makefile.radius inn-2.5.3/site/Makefile
+--- inn-2.5.3/site/Makefile.radius 2013-02-24 16:27:53.222500541 +0100
++++ inn-2.5.3/site/Makefile 2013-02-24 16:32:10.549406807 +0100
+@@ -46,7 +46,7 @@ PATH_STORAGECONF = ${PATHETC}/storage.co
+ PATH_CYCBUFFCONFIG = ${PATHETC}/cycbuff.conf
+ PATH_INNFEEDCTL = ${PATHETC}/innfeed.conf
+ PATH_BUFFINDEXED = ${PATHETC}/buffindexed.conf
+-PATH_RADIUS_CONF = ${PATHETC}/radius.conf
++PATH_RADIUS_CONF = ${PATHETC}/inn-radius.conf
+ PATH_OVDB_CONF = ${PATHETC}/ovdb.conf
+ PATH_SENDUUCP_CF = ${PATHETC}/send-uucp.cf
+ PATH_SUBSCRIPTIONS = ${PATHETC}/subscriptions
diff --git a/inn.spec b/inn.spec
index 73aec13..901e798 100644
--- a/inn.spec
+++ b/inn.spec
@@ -1,7 +1,9 @@
+%global _hardened_build 1
+
Summary: The InterNetNews system, an Usenet news server
Name: inn
Version: 2.5.3
-Release: 9%{?dist}
+Release: 10%{?dist}
#see LICENSE file for details
License: GPLv2+ and BSD and MIT and Public Domain
Group: System Environment/Daemons
@@ -30,6 +32,7 @@ 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
BuildRequires: python db4-devel byacc krb5-devel pam-devel e2fsprogs-devel perl
BuildRequires: perl(ExtUtils::Embed) flex systemd-units
Requires(pre): shadow-utils
@@ -115,6 +118,7 @@ exit 0
%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`
@@ -561,6 +565,10 @@ fi
%{_mandir}/man1/inews*
%changelog
+* Tue May 21 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-10
+- Building package with PIE flags (#965502)
+- Fix issue with recent pod2man releases
+
* Sun Feb 24 2013 Jochen Schmitt <Jochen herr-schmitt de> - 2.5.3-9
- Fix name conflict with libradius
More information about the scm-commits
mailing list