rpms/apg/devel apg-2.3.0b-gen_rand_pass.patch, NONE, 1.1 apg.spec, 1.9, 1.10

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/apg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6491

Modified Files:
	apg.spec 
Added Files:
	apg-2.3.0b-gen_rand_pass.patch 
Log Message:
sync with FC-4

apg-2.3.0b-gen_rand_pass.patch:

--- NEW FILE apg-2.3.0b-gen_rand_pass.patch ---
diff -Nur apg-2.3.0b-orig/apg.c apg-2.3.0b/apg.c
--- apg-2.3.0b-orig/apg.c	2003-08-07 17:40:39.000000000 +0200
+++ apg-2.3.0b/apg.c	2005-07-30 22:48:22.000000000 +0200
@@ -709,7 +709,7 @@
 */
 char * crypt_passstring (const char *p)
 {
- char salt[10];
+ char salt[11];
  gen_rand_pass (salt, 10, 10, S_SL|S_CL|S_NB);
  return (crypt(p, salt));
 }


Index: apg.spec
===================================================================
RCS file: /cvs/extras/rpms/apg/devel/apg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- apg.spec	24 Apr 2005 11:28:40 -0000	1.9
+++ apg.spec	30 Jul 2005 20:58:02 -0000	1.10
@@ -2,14 +2,14 @@
 Name:			apg
 
 Version:		2.3.0b
-Release:		1.fc4
-
+Release:		2%{?dist}
 License:		GPL
 Group:			System Environment/Base
 URL:			http://www.adel.nursat.kz/%{name}/
 
 Source0:		http://www.adel.nursat.kz/%{name}/download/%{name}-%{version}.tar.gz
 Source1:		apg.xinetd
+Patch0:			apg-2.3.0b-gen_rand_pass.patch
 
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -20,13 +20,14 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .gen_rand_pass
 
 %build
 # Build server
-make %{?_smp_mflags} cliserv
+make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} cliserv
 
 # Build standalone files
-make %{?_smp_mflags} standalone
+make CFLAGS="$RPM_OPT_FLAGS" FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} standalone
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -59,6 +60,11 @@
 %{_sysconfdir}/xinetd.d/apgd
 
 %changelog
+* Sat Jul 30 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.3.0b-2
+- Fix -y segfault (#164698).
+- Make with CFLAGS and FLAGS to build with RPM optflags to
+  repair debuginfo package.
+
 * Fri Apr 22 2005 Oliver Falk <oliver at linux-kernel.at>				- 2.3.0b-1_FC4
 - Add FC4 to the release tag, so it's newer than the FC3 package