From ea6b0cc597ca6f53948a966b07125de8820cf347 Mon Sep 17 00:00:00 2001
From: Stephen J Smoogen <smooge@fedoraproject.org>
Date: Mar 04 2008 21:03:34 +0000
Subject: Updating EL-4 patches to match EL-5 and F-x systems.


---

diff --git a/apg-2.3.0b-gen_rand_pass.patch b/apg-2.3.0b-gen_rand_pass.patch
new file mode 100644
index 0000000..a64462e
--- /dev/null
+++ b/apg-2.3.0b-gen_rand_pass.patch
@@ -0,0 +1,12 @@
+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));
+ }
diff --git a/apg.spec b/apg.spec
index cbef55a..f0d4a7d 100644
--- a/apg.spec
+++ b/apg.spec
@@ -2,14 +2,14 @@ Summary:		Automated Password Generator for random password generation
 Name:			apg
 
 Version:		2.3.0b
-Release:		1
-
-License:		GPL
+Release:		5%{?dist}
+License:		BSD
 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 @@ required type and prints them to standard output.
 
 %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,27 @@ fi
 %{_sysconfdir}/xinetd.d/apgd
 
 %changelog
+* Tue Mar  4 2008 Stephen John Smoogen <smooge@canopus.unm.edu> - 2.3.0b-5
+- Synced up with EL-5 spec file.
+
+* Tue Aug 21 2007 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-5
+- Fix incorrect license tag
+- Fix incorrect sources
+
+* Sun Aug 27 2006 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-4
+- Rebuild for fc6
+
+* Thu Feb 16 2006 Kevin Fenzi <kevin@tummy.com> - 2.3.0b-3
+- Rebuild for fc5
+
+* 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@linux-kernel.at>				- 2.3.0b-1_FC4
+- Add FC4 to the release tag, so it's newer than the FC3 package
+
 * Mon Apr 11 2005 Oliver Falk <oliver@linux-kernel.at>				- 2.3.0b-1
 - Merge FC devel specfile with lkernAT specfile (=> update)
 - Has now support for xinetd
diff --git a/sources b/sources
index a81f565..14208ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f9301ab654e15ea258d3904c8669a25  apg-2.3.0b.tar.gz
+bd82400a5a731070ce895313576afe24  apg-2.3.0b.tar.gz