rpms/pam_abl/devel pam_abl-0.2.3-build.patch, NONE, 1.1 pam_abl.spec, 1.6, 1.7

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/pam_abl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11733

Modified Files:
	pam_abl.spec 
Added Files:
	pam_abl-0.2.3-build.patch 
Log Message:
* Wed Jul  9 2008 Tomas Mraz <tmraz at redhat.com> - 0.2.3-6
- fix build (#449429)


pam_abl-0.2.3-build.patch:

--- NEW FILE pam_abl-0.2.3-build.patch ---
diff -up pam_abl/pam_abl.map.build pam_abl/pam_abl.map
--- pam_abl/pam_abl.map.build	2008-07-09 19:12:36.000000000 +0200
+++ pam_abl/pam_abl.map	2008-07-09 19:12:45.000000000 +0200
@@ -0,0 +1,12 @@
+{
+  global:
+    pam_sm_acct_mgmt;
+    pam_sm_authenticate;
+    pam_sm_chauthtok;
+    pam_sm_close_session;
+    pam_sm_open_session;
+    pam_sm_setcred;
+
+  local:
+    *;
+};
diff -up pam_abl/tools/Makefile.build pam_abl/tools/Makefile
--- pam_abl/tools/Makefile.build	2008-07-09 19:08:07.000000000 +0200
+++ pam_abl/tools/Makefile	2008-07-09 19:08:07.000000000 +0200
@@ -1,7 +1,7 @@
 # Makefile
 
 CFLAGS=-Wall -fPIC $(RPM_OPT_FLAGS)
-LIBS=-ldb -lpthread
+LIBS=-ldb
 TARGET=pam_abl
 OBJ=log.o config.o rule.o pam_abl.o
 INSTDIR=/usr/bin
@@ -9,7 +9,7 @@ INSTDIR=/usr/bin
 all : $(TARGET)
 
 $(TARGET) : $(OBJ)
-	cc $(LIBS) -o $@ $^
+	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
 
 install : $(TARGET)
 	install --mode=755 --strip $(TARGET) $(INSTDIR)
@@ -18,6 +18,6 @@ clean :
 	rm -f $(TARGET) $(OBJ)
 
 depend :
-	cc -MM *.c > deps
+	$(CC) -MM *.c > deps
 
 include deps
diff -up pam_abl/Makefile.build pam_abl/Makefile
--- pam_abl/Makefile.build	2008-07-09 19:08:07.000000000 +0200
+++ pam_abl/Makefile	2008-07-09 19:13:20.000000000 +0200
@@ -5,16 +5,17 @@ CFLAGS=-Wall -fPIC $(RPM_OPT_FLAGS)
 PAMDIR=/lib/security
 CONFDIR=/etc/security
 DBDIR=/var/lib/abl
-LIBS=-ldb -lpthread
+LIBS=-ldb -lpam
 MODULE=pam_abl.so
 OBJ=pam_abl.o log.o config.o rule.o
 SUBDIRS=tools
+MAP=pam_abl.map
 
 all : $(MODULE)
 	for d in $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done
 
 $(MODULE) : $(OBJ)
-	ld -x --shared $(LIBS) -o $@ $^
+	$(CC) $(CFLAGS) -shared -Wl,--version-script,$(MAP) $(LIBS) -o $@ $^
 
 clean :
 	rm -f $(MODULE) $(OBJ)
@@ -27,7 +28,7 @@ install : $(MODULE)
 	for d in t $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done
 
 depend :
-	cc -MM *.c > deps
+	$(CC) -MM *.c > deps
 	for d in $(SUBDIRS) ; do cd $$d && $(MAKE) $@ && cd .. ; done
 
 test :


Index: pam_abl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pam_abl/devel/pam_abl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pam_abl.spec	21 May 2008 16:44:39 -0000	1.6
+++ pam_abl.spec	9 Jul 2008 17:17:52 -0000	1.7
@@ -1,12 +1,13 @@
 Name:		pam_abl
 Summary:	A Pluggable Authentication Module (PAM) for auto blacklisting
 Version:	0.2.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	BSD or GPL+
 Group:		System Environment/Base
 URL:		http://www.hexten.net/sw/pam_abl/
 Source0:	http://dl.sourceforge.net/sourceforge/pam-abl/%{name}-%{version}.tar.gz	
 Patch0:		pam_abl-0.2.3-fixes.patch
+Patch1:		pam_abl-0.2.3-build.patch
 BuildRequires:	db4-devel, pam-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -19,7 +20,8 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
+%patch0 -p1 -b .fixes
+%patch1 -p1 -b .build
 
 %build
 make %{?_smp_mflags}
@@ -39,7 +41,7 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS CONFIGURATION COPYING NEWS QUICKSTART THANKS
-%doc Copyright conf/system-auth doc
+%doc Copyright conf/system-auth doc/*.html doc/*.css
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/security/pam_abl.conf
 /%{_lib}/security/pam_abl.so
@@ -48,6 +50,9 @@
 %{_mandir}/man?/%{name}.*
 
 %changelog
+* Wed Jul  9 2008 Tomas Mraz <tmraz at redhat.com> - 0.2.3-6
+- fix build (#449429)
+
 * Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.2.3-5
 - fix license tag