Gentoo Archives: gentoo-commits

From: Dane Smith <c1pher@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/c1pher:master commit in: sys-auth/libpam-google-authenticator/, ...
Date: Thu, 07 Jun 2012 14:45:12
Message-Id: 1339080273.be49e7040f6b6f770187f70f324e81349b1fdfc7.c1pher@gentoo
1 commit: be49e7040f6b6f770187f70f324e81349b1fdfc7
2 Author: Dane Smith <c1pher <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 7 14:44:33 2012 +0000
4 Commit: Dane Smith <c1pher <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 7 14:44:33 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=be49e704
7
8 drop unneded patch.
9
10 ---
11 sys-auth/libpam-google-authenticator/Manifest | 3 +-
12 .../files/makefile.patch | 41 --------------------
13 .../libpam-google-authenticator-1.0.ebuild | 4 --
14 3 files changed, 1 insertions(+), 47 deletions(-)
15
16 diff --git a/sys-auth/libpam-google-authenticator/Manifest b/sys-auth/libpam-google-authenticator/Manifest
17 index d892652..bd20b65 100644
18 --- a/sys-auth/libpam-google-authenticator/Manifest
19 +++ b/sys-auth/libpam-google-authenticator/Manifest
20 @@ -1,3 +1,2 @@
21 -AUX makefile.patch 2387 RMD160 0b70faa355d224525a428f465e7b9642f531823b SHA1 736e82dabf41b0deb58bc7725cc990abe1246864 SHA256 71c866cad836492f35bbc2fde24e6fc2430181de31421af8a97305eec3b82842
22 DIST libpam-google-authenticator-1.0-source.tar.bz2 32708 RMD160 ce26a2f805f36a82a7ab3d930116a73fb444e037 SHA1 017b7d89989f1624e360abe02d6b27a6298d285d SHA256 80426045d13ce7a2bf56c692ccfb1751cef3c7484752ad40738facf729264d4b
23 -EBUILD libpam-google-authenticator-1.0.ebuild 682 RMD160 e73b10b6b01e92569cafc0904f3b94cee53a2afa SHA1 9e47403d126dc7c48ee6d367c3b4483b34292f6a SHA256 238d96809743c8f3a1e58f5838e95f617af12ff604c6b0b89a2d79bd927bcca0
24 +EBUILD libpam-google-authenticator-1.0.ebuild 627 RMD160 95b8b8c213930976e5a47d624ae7ad0aaa852582 SHA1 63048eeef57535f1079e7596b72797fa91545bad SHA256 859bd5f93cc36c154b8bddaa7ccc9788da8bec0d329986be1108ae729d201b7c
25
26 diff --git a/sys-auth/libpam-google-authenticator/files/makefile.patch b/sys-auth/libpam-google-authenticator/files/makefile.patch
27 deleted file mode 100644
28 index 2792456..0000000
29 --- a/sys-auth/libpam-google-authenticator/files/makefile.patch
30 +++ /dev/null
31 @@ -1,41 +0,0 @@
32 ---- Makefile 2012-06-06 14:39:56.000000000 -0400
33 -+++ Makefile.new 2012-06-06 14:40:05.000000000 -0400
34 -@@ -28,6 +28,7 @@
35 - DEF_LDFLAGS := $(shell [ `uname` = SunOS ] && echo ' -mimpure-text') $(LDFLAGS)
36 - LDL_LDFLAGS := $(shell $(CC) -shared -ldl -xc -o /dev/null /dev/null \
37 - >/dev/null 2>&1 && echo ' -ldl')
38 -+DESTDIR :=
39 -
40 - all: google-authenticator pam_google_authenticator.so demo \
41 - pam_google_authenticator_unittest
42 -@@ -43,26 +44,11 @@
43 - *.c *.h *.html Makefile FILEFORMAT README utc-time
44 -
45 - install: all
46 -- @dst="`find /lib*/security /lib*/*/security -maxdepth 1 \
47 -- -name pam_unix.so -printf '%H' -quit 2>/dev/null`"; \
48 -- [ -d "$${dst}" ] || dst=/lib/security; \
49 -- [ -d "$${dst}" ] || dst=/usr/lib; \
50 -- sudo=; if [ $$(id -u) -ne 0 ]; then \
51 -- echo "You need to be root to install this module."; \
52 -- if [ -x /usr/bin/sudo ]; then \
53 -- echo "Invoking sudo:"; \
54 -- sudo=sudo; \
55 -- else \
56 -- exit 1; \
57 -- fi; \
58 -- fi; \
59 -- echo cp pam_google_authenticator.so $${dst}; \
60 -- tar fc - pam_google_authenticator.so | $${sudo} tar ofxC - $${dst}; \
61 -+ echo install -m 755 pam_google_authenticator.so ${DESTDIR}; \
62 -+ install -m 755 pam_google_authenticator.so ${DESTDIR}; \
63 - \
64 -- echo cp google-authenticator /usr/local/bin; \
65 -- tar fc - google-authenticator | $${sudo} tar ofxC - /usr/local/bin; \
66 -- $${sudo} chmod 755 $${dst}/pam_google_authenticator.so \
67 -- /usr/local/bin/google-authenticator
68 -+ echo install -m 755 google-authenticator ${DESTDIR}; \
69 -+ install -m 755 google-authenticator ${DESTDIR}; \
70 -
71 - clean:
72 - $(RM) *.o *.so core google-authenticator demo \
73
74 diff --git a/sys-auth/libpam-google-authenticator/libpam-google-authenticator-1.0.ebuild b/sys-auth/libpam-google-authenticator/libpam-google-authenticator-1.0.ebuild
75 index 2c67ddf..e716524 100644
76 --- a/sys-auth/libpam-google-authenticator/libpam-google-authenticator-1.0.ebuild
77 +++ b/sys-auth/libpam-google-authenticator/libpam-google-authenticator-1.0.ebuild
78 @@ -17,10 +17,6 @@ IUSE=""
79 DEPEND="sys-libs/pam"
80 RDEPEND="${DEPEND}"
81
82 -src_prepare(){
83 - epatch "${FILESDIR}/makefile.patch"
84 -}
85 -
86 src_install(){
87 insinto $(getpam_mod_dir)
88 doins pam_google_authenticator.so