Remove lpthread patches from the "security" category.

This commit is contained in:
ajacoutot 2012-08-19 13:30:04 +00:00
parent 47f3bffd1f
commit ec4340a364
7 changed files with 14 additions and 67 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2012/08/11 22:58:18 pascal Exp $
# $OpenBSD: Makefile,v 1.12 2012/08/19 13:30:04 ajacoutot Exp $
COMMENT= 802.11 WEP and WPA-PSK keys cracking program
DISTNAME= aircrack-ng-1.1
REVISION= 6
REVISION= 7
CATEGORIES= security
HOMEPAGE= http://www.aircrack-ng.org/

View File

@ -21,47 +21,3 @@
endif
endif
endif
@@ -126,21 +126,21 @@ $(LIBOSD):
aircrack-ng-opt: $(SRC_AC)
$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) $(SRC_AC) $(ASM_AC) $(LIBSSL) \
- uniqueiv.o -o aircrack-ng-opt -lpthread $(LIBSQL)
+ uniqueiv.o -o aircrack-ng-opt -pthread $(LIBSQL)
aircrack-ng-opt-prof_gen: $(SRC_AC)
mkdir -p prof
$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) -prof_genx -DDO_PGO_DUMP \
-prof_dir$(PROF_DIR) $(SRC_AC) $(ASM_AC) $(LIBSSL) uniqueiv.o -o \
- aircrack-ng-opt-prof_gen -lpthread $(LIBSQL)
+ aircrack-ng-opt-prof_gen -pthread $(LIBSQL)
aircrack-ng-opt-prof_use: $(SRC_AC)
$(iCC) $(iCFLAGS) $(iOPTFLAGS) $(REVFLAGS) -prof_use \
-prof_dir$(PROF_DIR) $(SRC_AC) $(ASM_AC) $(LIBSSL) uniqueiv.o -o \
- aircrack-ng-opt-prof -lpthread $(LIBSQL)
+ aircrack-ng-opt-prof -pthread $(LIBSQL)
aircrack-ng$(EXE): $(OBJS_AC)
- $(CC) $(CFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -lpthread $(LIBSSL) $(LIBSQL)
+ $(CC) $(CFLAGS) $(OBJS_AC) $(ASM_AC) -o $(@) -pthread $(LIBSSL) $(LIBSQL)
airdecap-ng$(EXE): $(OBJS_AD)
$(CC) $(CFLAGS) $(OBJS_AD) -o $(@) $(LIBSSL)
@@ -152,7 +152,7 @@ aireplay-ng$(EXE): $(OBJS_AR) $(LIBOSD)
$(CC) $(CFLAGS) $(OBJS_AR) -o $(@) $(LIBS) $(LIBSSL)
airodump-ng$(EXE): $(OBJS_ADU) $(LIBOSD)
- $(CC) $(CFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ $(CC) $(CFLAGS) $(OBJS_ADU) -o $(@) $(LIBS) $(LIBSSL) -pthread
airserv-ng$(EXE): $(OBJS_AS) $(LIBOSD)
$(CC) $(CFLAGS) $(OBJS_AS) -o $(@) $(LIBS) $(LIBPCAP)
@@ -182,7 +182,7 @@ airolib-ng$(EXE): $(OBJS_AL)
$(CC) $(CFLAGS) $(OBJS_AL) -o $(@) $(LIBSSL) -DHAVE_REGEXP $(LIBSQL)
airbase-ng$(EXE): $(OBJS_AB) $(LIBOSD)
- $(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -lpthread
+ $(CC) $(CFLAGS) $(OBJS_AB) -o $(@) $(LIBS) $(LIBSSL) -pthread
airdecloak-ng$(EXE): $(OBJS_AU)
$(CC) $(CFLAGS) $(OBJS_AU) -o $(@)

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.4 2012/07/15 08:12:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2012/08/19 13:30:04 ajacoutot Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
@ -9,6 +9,7 @@ PKGNAME= ${DISTNAME:L}
CATEGORIES= security
MASTER_SITES= ${HOMEPAGE}files/
EXTRACT_SUFX= .tbz
REVISION= 0
SHARED_LIBS= botan-1.10 0.1
@ -54,9 +55,6 @@ PKG_ARGS+= -Damd64=1
PKG_ARGS+= -Damd64=0
.endif
post-configure:
@perl -pi -e "s|-lpthread|-pthread|g" ${WRKSRC}/Makefile
do-regress:
@cd ${WRKBUILD} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${ALL_REGRESS_FLAGS} \
check && env LD_LIBRARY_PATH=${WRKBUILD} ./check --test

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.2 2011/01/12 15:19:14 pea Exp $
# $OpenBSD: Makefile,v 1.3 2012/08/19 13:30:04 ajacoutot Exp $
COMMENT= provide cryptographic tunnel
DISTNAME= ctunnel-0.4
CATEGORIES= security
REVISION= 0
HOMEPAGE= http://nardcore.org/ctunnel/

View File

@ -1,15 +1,13 @@
$OpenBSD: patch-src_Makefile,v 1.1 2011/01/12 15:19:15 pea Exp $
$OpenBSD: patch-src_Makefile,v 1.2 2012/08/19 13:30:04 ajacoutot Exp $
--- src/Makefile.orig Thu Jun 3 08:05:01 2010
+++ src/Makefile Wed Jan 12 11:41:17 2011
@@ -1,7 +1,8 @@
+++ src/Makefile Sun Aug 19 15:28:03 2012
@@ -1,6 +1,7 @@
include ../Makefile.cfg
-CC=gcc
-CFLAGS=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -g -O2 -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
-LDFLAGS=-lz -lpthread
+CC?=gcc
+CFLAGS ?=
+CFLAGS +=-Wall -Wcast-align -Wshadow -Wstrict-prototypes -DHAVE_$(CRYPTO_TYPE) -I../include -I./include
+LDFLAGS=-lz -pthread
LDFLAGS=-lz -lpthread
ifeq ($(CRYPTO_TYPE),OPENSSL)
LDFLAGS+=-lcrypto

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.55 2012/08/06 07:54:22 sthen Exp $
# $OpenBSD: Makefile,v 1.56 2012/08/19 13:30:04 ajacoutot Exp $
COMMENT= GNU Transport Layer Security library
DISTNAME= gnutls-3.0.22
EXTRACT_SUFX= .tar.xz
REVISION= 0
CATEGORIES= security
@ -50,10 +51,6 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -pthread"
pre-configure:
perl -pi -e 's,-lpthread,-pthread,g' \
${WRKSRC}/tests/suite/Makefile.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnutls
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnutls

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.25 2011/08/30 06:43:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.26 2012/08/19 13:30:04 ajacoutot Exp $
COMMENT= GnuPG Made Easy
DISTNAME= gpgme-1.3.1
CATEGORIES= security devel
REVISION= 0
SHARED_LIBS += gpgme 18.0 # 19.0
SHARED_LIBS += gpgme-pthread 18.0 # 19.0
@ -41,8 +42,4 @@ USE_GMAKE= Yes
USE_LIBTOOL= Yes
pre-configure:
perl -pi -e 's,-lpthread,-pthread,g' \
${WRKSRC}/{configure,src/Makefile.in,src/gpgme-config.in}
.include <bsd.port.mk>