rpms/quagga/devel quagga-0.98.5-pam.patch, NONE, 1.1 quagga.spec, 1.22, 1.23

[fedora-cvs-commits at redhat.com]

Author: fenlason

Update of /cvs/dist/rpms/quagga/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7121

Modified Files:
	quagga.spec 
Added Files:
	quagga-0.98.5-pam.patch 
Log Message:
Bugzilla Bug 170256 ? pam_stack is deprecated
Bugzilla Bug 164333 ? quagga 0.98.4-2 requires now obsolete package ucd-snmp-devel
and cleanup of the way CFLAGS is generated.


quagga-0.98.5-pam.patch:
 quagga.pam |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

--- NEW FILE quagga-0.98.5-pam.patch ---
--- quagga-0.98.5/redhat/quagga.pam.old	2004-06-06 06:27:53.000000000 -0400
+++ quagga-0.98.5/redhat/quagga.pam	2005-10-10 17:47:44.000000000 -0400
@@ -4,12 +4,12 @@
 ##### if running quagga as root:
 # Only allow root (and possibly wheel) to use this because enable access
 # is unrestricted.
-auth       sufficient   /lib/security/$ISA/pam_rootok.so
+auth       sufficient   pam_rootok.so
 
 # Uncomment the following line to implicitly trust users in the "wheel" group.
-#auth       sufficient   /lib/security/$ISA/pam_wheel.so trust use_uid
+#auth       sufficient   pam_wheel.so trust use_uid
 # Uncomment the following line to require a user to be in the "wheel" group.
-#auth       required     /lib/security/$ISA/pam_wheel.so use_uid
+#auth       required     pam_wheel.so use_uid
 ###########################################################
 
 # If using quagga privileges and with a seperate group for vty access, then
@@ -17,10 +17,10 @@
 # check for valid user/password, eg:
 #
 # only allow local users.
-#auth       required     /lib/security/$ISA/pam_securetty.so
-#auth       required     /lib/security/$ISA/pam_stack.so service=system-auth
-#auth       required     /lib/security/$ISA/pam_nologin.so
-#account    required     /lib/security/$ISA/pam_stack.so service=system-auth
-#password   required     /lib/security/$ISA/pam_stack.so service=system-auth
-#session    required     /lib/security/$ISA/pam_stack.so service=system-auth
-#session    optional     /lib/security/$ISA/pam_console.so
+#auth       required     pam_securetty.so
+#auth       include      system-auth
+#account    required     pam_nologin.so
+#account    include      system-auth
+#password   include      system-auth
+#session    include      system-auth
+#session    optional     pam_console.so


Index: quagga.spec
===================================================================
RCS file: /cvs/dist/rpms/quagga/devel/quagga.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- quagga.spec	30 Aug 2005 02:22:42 -0000	1.22
+++ quagga.spec	18 Oct 2005 15:39:36 -0000	1.23
@@ -5,7 +5,6 @@
 %define		with_nssa	1
 %define		with_opaque_lsa 1
 %define		with_tcp_zebra	0
-%define		with_vtysh	1
 %define		with_pam	1
 %define		with_ipv6	1
 %define		with_ospfclient 1
@@ -32,7 +31,7 @@
 Summary: Routing daemon
 Name:		quagga
 Version:	0.98.5
-Release: 2
+Release: 3
 Epoch: 0
 License:	GPL
 Group: System Environment/Daemons
@@ -42,11 +41,12 @@
 Patch1:         quagga-0.96.3-netlink.patch
 Patch2:		quagga-0.96.5-nostart.patch
 Patch4:		quagga-0.98.2-gcc4.patch
+Patch5:		quagga-0.98.5-pam.patch
 
 URL:		http://www.quagga.net
 %if %with_snmp
-BuildRequires:	ucd-snmp-devel
-Prereq:		ucd-snmp
+BuildRequires:	net-snmp-devel
+Prereq:		net-snmp
 %endif
 %if %with_vtysh
 BuildRequires:	readline readline-devel ncurses ncurses-devel
@@ -97,9 +97,22 @@
 %patch1 -p1 -b .netlink
 %patch2 -p1 -b .nostart
 %patch4 -p1 -b .gcc4
+%patch5 -p1 -b .pam
 
 %build
-CFLAGS=-fPIE ; LDFLAGS=-pie ; %configure \
+%ifarch s390 s390x
+export PIECFLAGS="-fPIE"
+%else                   
+export PIECFLAGS="-fpie"
+%endif                  
+# FC5+ automatic -fstack-protector-all switch
+export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector/-fstack-protector-all}
+#./autogen.sh                                                                 
+export CFLAGS="$RPM_OPT_FLAGS $PIECFLAGS $CPPFLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS $PIECFLAGS $CPPFLAGS"
+export LDFLAGS="-pie"
+
+%configure \
 %if %with_ipv6
 	--enable-ipv6 \
 %endif
@@ -147,10 +160,9 @@
 %if %with_rtadv
 	--enable-rtadv \
 %endif
---with-cflags="-O2" \
 --enable-netlink
 
-CFLAGS=-fPIE ; LDFLAGS=-pie ; make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
+make %{?_smp_mflags} MAKEINFO="makeinfo --no-split"
 
 pushd doc
 texi2html quagga.texi
@@ -334,6 +346,16 @@
 %endif
 
 %changelog
+* Mon Oct 17 2005 Jay Fenlason <fenlason at redhat.com> 0.98.5-3
+- Modify the way CFLAGS is set and passed to configure and make, so
+  we use RPMs default cflags, with -pie/-fpie added.  This gets us
+  -D_FORTIFY_SOURCE, etc, which is good for critical daemons.
+- Include -pam patch to close
+  bz#170256 ? pam_stack is deprecated
+- Change ucd-snmp to net-snmp to close
+  bz#164333 ? quagga 0.98.4-2 requires now obsolete package ucd-snmp-devel
+- also fix duplicate line mentioned in bz#164333
+
 * Mon Aug 29 2005 Jay Fenlason <fenlason at redhat.com> 0.98.5-2
 - New upstream version.