diff -uN pam_sotp-rpm.orig/pam_sotp-0.3.3-cc_link.patch pam_sotp-rpm/pam_sotp-0.3.3-cc_link.patch --- pam_sotp-rpm.orig/pam_sotp-0.3.3-cc_link.patch 1970-01-01 12:00:00.000000000 +1200 +++ pam_sotp-rpm/pam_sotp-0.3.3-cc_link.patch 2008-11-03 12:55:23.000000000 +1300 @@ -0,0 +1,20 @@ +--- pam_sotp-0.3.3.orig/src/pam/Makefile.in 2004-12-09 06:21:30.000000000 +1300 ++++ pam_sotp-0.3.3/src/pam/Makefile.in 2008-11-03 12:47:05.000000000 +1300 +@@ -23,7 +23,7 @@ + CFLAGS=-O @DEFS@ -fPIC -Wall + INCLUDES=-I../libsotp + LIBDIR=../libsotp +-LD_SOFLAGS=-x --shared ++CC_LINK_FLAGS=-Wl,-x -shared $(CFLAGS) + + TARGET=pam_sotp.so + OBJECTS= options.o conv.o logger.o pam_sotp.o +@@ -34,7 +34,7 @@ + + + pam_sotp.so: $(OBJECTS) +- $(LD) -o $@ $(LD_SOFLAGS) $^ -L$(LIBDIR) -lc -lpam -lsotp ++ $(CC) -o $@ $(CC_LINK_FLAGS) $^ -L$(LIBDIR) -lc -lpam -lsotp + + + %.o: %.c diff -uN pam_sotp-rpm.orig/pam_sotp.spec pam_sotp-rpm/pam_sotp.spec --- pam_sotp-rpm.orig/pam_sotp.spec 2008-11-03 11:01:08.000000000 +1300 +++ pam_sotp-rpm/pam_sotp.spec 2008-11-03 13:02:30.000000000 +1300 @@ -4,7 +4,7 @@ Name: pam_sotp Version: 0.3.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: PAM module that provides support for One Time Passwords (OTP) authentication Group: System Environment/Base @@ -15,6 +15,7 @@ Source2: pam_sotp-pam-config_include Source3: pam_sotp-README.RPM Patch0: pam_sotp-0.3.3-no_shadow_group.patch +Patch1: pam_sotp-0.3.3-cc_link.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pam-devel, sed, links @@ -28,6 +29,7 @@ %prep %setup -q %patch0 -p1 -b .shadow +%patch1 -p1 -b .cclink %build @@ -70,5 +72,9 @@ %{_bindir}/otppasswd %changelog +* Mon Nov 03 2008 Douglas Bagnall 0.3.3-3 +- revert '-fno-stack-protector', use gcc instead of ld to link. +* Fri Oct 24 2008 Douglas Bagnall 0.3.3-2 +- add '-fno-stack-protector' to CFLAGS. * Wed Jul 23 2008 Rahul Sundaram 0.3.3-1 - initial build