[svn] r9090 - in /trunk/rpms/pam_shield: pam_shield-0.9.3-makefile.patch pam_shield.spec

Dag Wieers dag at wieers.com
Wed Sep 1 16:52:16 CEST 2010


Author: dag
Date: Wed Sep  1 15:52:16 2010
New Revision: 9090

URL: http://svn.rpmforge.net/viewvc/rpmforge?rev=9090&view=rev
Log:
Simplified SPEC file and updated Makefile patch.

Added:
    trunk/rpms/pam_shield/pam_shield-0.9.3-makefile.patch
Modified:
    trunk/rpms/pam_shield/pam_shield.spec

Added: trunk/rpms/pam_shield/pam_shield-0.9.3-makefile.patch
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pam_shield/pam_shield-0.9.3-makefile.patch?rev=9090&view=markup
==============================================================================
--- trunk/rpms/pam_shield/pam_shield-0.9.3-makefile.patch (added)
+++ trunk/rpms/pam_shield/pam_shield-0.9.3-makefile.patch Wed Sep  1 15:52:16 2010
@@ -1,0 +1,57 @@
+--- pam_shield-0.9.3/Makefile.orig	2010-09-01 16:44:33.000000000 +0200
++++ pam_shield-0.9.3/Makefile	2010-09-01 16:51:13.000000000 +0200
+@@ -2,10 +2,16 @@
+ #	pam_shield	WJ106
+ #
+ 
+-bindir=/usr/sbin
+-confdir=/etc/security
+-pamdir=/lib/security
+-crondir=/etc/cron.daily
++prefix=/usr
++bindir=$(prefix)/sbin
++sysconfdir=/etc
++confdir=$(sysconfdir)/security
++libdir=/lib
++pamdir=$(libdir)/security
++crondir=$(sysconfdir)/cron.daily
++localstatedir=/var
++
++DESTDIR=
+ 
+ CC = gcc
+ LD = ld
+@@ -43,19 +49,21 @@
+ 	$(CC) -M pam_shield.c shield_purge.c > .depend
+ 
+ install: all
+-	$(INSTALL) -s -o root -g root -m 644 pam_shield.so ${pamdir}
+-	$(INSTALL) -o root -g root -m 755 -T pam_shield.cron ${crondir}/pam-shield
+-	$(INSTALL) -o root -g root -m 755 shield-trigger.sh ${bindir}
+-	$(INSTALL) -s -o root -g root -m 755 shield-purge ${bindir}
+-	$(INSTALL) -o root -g root -m 644 shield.conf ${confdir}
+-	$(MKDIR) -p -m 700 /var/lib/pam_shield
++	$(INSTALL) -Dp -m0644 pam_shield.so $(DESTDIR)$(pamdir)/pam_shield.so
++	$(INSTALL) -Dp -m0755 pam_shield.cron $(DESTDIR)$(crondir)/pam-shield
++	$(INSTALL) -Dp -m0755 shield-trigger.sh $(DESTDIR)$(bindir)/shield-trigger
++	$(INSTALL) -Dp -m0755 shield-trigger-iptables.sh $(DESTDIR)$(bindir)/shield-trigger-iptables
++	$(INSTALL) -Dp -m0755 shield-purge $(DESTDIR)$(bindir)/shield-purge
++	$(INSTALL) -Dp -m0644 shield.conf $(DESTDIR)$(confdir)/shield.conf
++	$(INSTALL) -dp -m0700 $(DESTDIR)$(localstatedir)/lib/pam_shield/
+ 
+ uninstall:
+-	$(RM) ${pamdir}/pam_shield.so
+-	$(RM) ${crondir}/pam-shield
+-	$(RM) ${bindir}/shield-trigger.sh
+-	$(RM) ${bindir}/shield-purge
+-	$(RM) ${confdir}/shield.conf
+-	$(RM) -r /var/lib/pam_shield
++	$(RM) $(pamdir)/pam_shield.so
++	$(RM) $(crondir)/pam-shield
++	$(RM) $(bindir)/shield-trigger
++	$(RM) $(bindir)/shield-trigger-iptables
++	$(RM) $(bindir)/shield-purge
++	$(RM) $(confdir)/shield.conf
++	$(RM) -r $(localstatedir)/lib/pam_shield/
+ 
+ # EOB

Modified: trunk/rpms/pam_shield/pam_shield.spec
URL: http://svn.rpmforge.net/viewvc/rpmforge/trunk/rpms/pam_shield/pam_shield.spec?rev=9090&r1=9089&r2=9090&view=diff
==============================================================================
--- trunk/rpms/pam_shield/pam_shield.spec (original)
+++ trunk/rpms/pam_shield/pam_shield.spec Wed Sep  1 15:52:16 2010
@@ -13,7 +13,7 @@
 URL: http://www.heiho.net/pam_shield/
 
 Source: http://www.heiho.net/pam_shield/pam_shield-%{version}.tar.gz
-Patch0: pam_shield-0.9.1-makefile.patch
+Patch0: pam_shield-0.9.3-makefile.patch
 Patch1: pam_shield-0.9.3-authpriv.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -28,7 +28,7 @@
 
 %prep
 %setup
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 
 %build
@@ -37,13 +37,6 @@
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR="%{buildroot}" libdir="%{_libdir}"
-
-%{__install} -d -m0755 %{buildroot}%{_localstatedir}/lib/pam_shield/
-
-### FIXME: name of script is referenced in shield.conf differently (Please fix upstream)
-%{__mv} -f %{buildroot}%{_sbindir}/shield-trigger.sh %{buildroot}%{_sbindir}/shield-trigger
-
-%{__install} -Dp -m0755 shield-trigger-iptables.sh %{buildroot}%{_sbindir}/shield-trigger-iptables
 
 %clean
 %{__rm} -rf %{buildroot}




More information about the commits mailing list