aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorpgollucci <pgollucci@FreeBSD.org>2012-02-15 03:17:12 +0800
committerpgollucci <pgollucci@FreeBSD.org>2012-02-15 03:17:12 +0800
commitb97854ac38474b993e60d1dc16a64d3e358792b1 (patch)
tree9ad05113f514cc87c89cf674fa0ff5c05c44bae1 /security
parent3986a46e097cbf2a1616a7cc67d1559d28c16d47 (diff)
downloadfreebsd-ports-gnome-b97854ac38474b993e60d1dc16a64d3e358792b1.tar.gz
freebsd-ports-gnome-b97854ac38474b993e60d1dc16a64d3e358792b1.tar.zst
freebsd-ports-gnome-b97854ac38474b993e60d1dc16a64d3e358792b1.zip
- Bump PORTREVISION
- Better/different fix for /dev/null issue PR: ports/165096 Submitted by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> (maintainer)
Diffstat (limited to 'security')
-rw-r--r--security/pam_google_authenticator/Makefile2
-rw-r--r--security/pam_google_authenticator/files/patch-Makefile25
2 files changed, 22 insertions, 5 deletions
diff --git a/security/pam_google_authenticator/Makefile b/security/pam_google_authenticator/Makefile
index d127b234791e..145a36e87d84 100644
--- a/security/pam_google_authenticator/Makefile
+++ b/security/pam_google_authenticator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= pam_google_authenticator
PORTVERSION= 20120119
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= LOCAL/dumbbell
DISTNAME= google-authenticator-${PORTVERSION}
diff --git a/security/pam_google_authenticator/files/patch-Makefile b/security/pam_google_authenticator/files/patch-Makefile
index 3f43a6a6973b..0061994b5872 100644
--- a/security/pam_google_authenticator/files/patch-Makefile
+++ b/security/pam_google_authenticator/files/patch-Makefile
@@ -1,12 +1,29 @@
---- ./Makefile.orig 2012-02-12 20:34:01.605839492 +0000
-+++ ./Makefile 2012-02-12 20:34:11.541834894 +0000
-@@ -24,8 +24,7 @@
+--- Makefile.orig 2012-01-18 18:05:11.000000000 +0800
++++ Makefile 2012-02-13 21:43:14.409460968 +0800
+@@ -24,8 +24,6 @@
echo ' -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT') \
-fvisibility=hidden $(CFLAGS)
DEF_LDFLAGS := $(shell [ `uname` = SunOS ] && echo ' -mimpure-text') $(LDFLAGS)
-LDL_LDFLAGS := $(shell $(CC) -shared -ldl -xc -o /dev/null /dev/null \
- >/dev/null 2>&1 && echo ' -ldl')
-+LDL_LDFLAGS := $(shell $(CC) -shared -ldl -xc >/dev/null 2>&1 && echo ' -ldl')
all: google-authenticator pam_google_authenticator.so demo \
pam_google_authenticator_unittest
+@@ -60,14 +58,14 @@
+ pam_google_authenticator_unittest
+
+ google-authenticator: google-authenticator.o base32.o hmac.o sha1.o
+- $(CC) -g $(DEF_LDFLAGS) -o $@ $+ $(LDL_LDFLAGS)
++ $(CC) -g $(DEF_LDFLAGS) -o $@ $+
+
+ demo: demo.o pam_google_authenticator_demo.o base32.o hmac.o sha1.o
+- $(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@ $+ $(LDL_LDFLAGS)
++ $(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@ $+
+
+ pam_google_authenticator_unittest: pam_google_authenticator_unittest.o \
+ base32.o hmac.o sha1.o
+- $(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@ $+ -lc $(LDL_LDFLAGS)
++ $(CC) -g $(DEF_LDFLAGS) -rdynamic -o $@ $+ -lc
+
+ pam_google_authenticator.so: base32.o hmac.o sha1.o
+ pam_google_authenticator_testing.so: base32.o hmac.o sha1.o