Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/agc-netpgp-standalone]: src/crypto/external/bsd/netpgp get rid of the ol...
details: https://anonhg.NetBSD.org/src/rev/e3314cc6fca8
branches: agc-netpgp-standalone
changeset: 777805:e3314cc6fca8
user: agc <agc%NetBSD.org@localhost>
date: Sun May 06 18:14:16 2012 +0000
description:
get rid of the old reachover infrastructure (which was horribly non-standard
anyway).
Replace with the new reachover build infrastructure for standalone netpgp
diffstat:
crypto/external/bsd/netpgp/Makefile | 6 +--
crypto/external/bsd/netpgp/hkpc/Makefile | 25 -----------------
crypto/external/bsd/netpgp/hkpd/Makefile | 33 -----------------------
crypto/external/bsd/netpgp/libmj/Makefile | 19 -------------
crypto/external/bsd/netpgp/libmj/shlib_version | 2 -
crypto/external/bsd/netpgp/libpaa/Makefile | 33 -----------------------
crypto/external/bsd/netpgp/libpaa/client/Makefile | 18 ------------
crypto/external/bsd/netpgp/libpaa/server/Makefile | 18 ------------
crypto/external/bsd/netpgp/libpaa/shlib_version | 2 -
crypto/external/bsd/netpgp/netpgp/Makefile | 30 --------------------
crypto/external/bsd/netpgp/netpgpkeys/Makefile | 29 --------------------
crypto/external/bsd/netpgp/netpgpverify/Makefile | 33 -----------------------
crypto/external/bsd/netpgp/pgp2ssh/Makefile | 27 ------------------
13 files changed, 2 insertions(+), 273 deletions(-)
diffs (truncated from 331 to 300 lines):
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/Makefile Sun May 06 18:08:12 2012 +0000
+++ b/crypto/external/bsd/netpgp/Makefile Sun May 06 18:14:16 2012 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/09/02 06:00:11 agc Exp $
+# $NetBSD: Makefile,v 1.5.10.1 2012/05/06 18:14:16 agc Exp $
-SUBDIR= libmj .WAIT
SUBDIR+= lib .WAIT
-SUBDIR+= netpgp netpgpkeys netpgpverify
-#SUBDIR+= hkpc hkpd
+SUBDIR+= bin
.include <bsd.subdir.mk>
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/hkpc/Makefile
--- a/crypto/external/bsd/netpgp/hkpc/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/09/02 05:58:00 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG=hkpc
-BINDIR=/usr/bin
-SRCS=hkpc.c main.c
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPDIR} -lnetpgp
-DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+= -L${LIBMJDIR} -lmj
-DPADD+= ${LIBMJDIR}/libmj.a
-
-LDADD+= -lcrypto -lz -lbz2
-DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-WARNS=0
-MAN=hkpc.1
-
-.PATH: ${.CURDIR}/../dist/src/hkpclient
-
-.include <bsd.prog.mk>
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/hkpd/Makefile
--- a/crypto/external/bsd/netpgp/hkpd/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/09/02 05:58:00 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG=hkpd
-BINDIR=/usr/sbin
-SRCS=hkpd.c main.c
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPDIR} -lnetpgp
-DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+= -L${LIBMJDIR} -lmj
-DPADD+= ${LIBMJDIR}/libmj.a
-
-LDADD+= -lcrypto -lz -lbz2
-DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-MAN=hkpd.1
-WARNS=0 # anything over 0 will fail at the link stage with IDEA errors
-
-.PATH: ${.CURDIR}/../dist/src/hkpd
-
-.include <bsd.prog.mk>
-
-t: ${PROG}
- ./${PROG} -D &
- sleep 1
- ftp -o- 'http://localhost:11371/pks/lookup?op=index&search=agc&options=json'
- ftp -o- 'http://localhost:11371/pks/lookup?op=get&search=agc&options=json'
- ftp -o- 'http://localhost:11371/pks/lookup?op=get&search=agc&options=mr'
- pkill hkpd
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libmj/Makefile
--- a/crypto/external/bsd/netpgp/libmj/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/08/07 04:17:49 agc Exp $
-
-.include <bsd.own.mk>
-
-USE_FORT?= yes
-
-LIB= mj
-SRCS= mj.c
-MAN= libmj.3
-WARNS=4
-
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/include ${EXTDIST}/src/libmj
-
-INCS+= mj.h
-INCSDIR=/usr/include
-
-.include <bsd.lib.mk>
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libmj/shlib_version
--- a/crypto/external/bsd/netpgp/libmj/shlib_version Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-major=1
-minor=0
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libpaa/Makefile
--- a/crypto/external/bsd/netpgp/libpaa/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/09/10 05:29:12 agc Exp $
-
-.include <bsd.own.mk>
-
-USE_FORT?= yes
-
-LIB= paa
-
-SRCS= b64.c libpaa.c
-CPPFLAGS+= -I${.CURDIR}/../dist/include -I${.CURDIR}/../dist/src/pgp2ssh
-
-LIBDPLIBS+= mj ${.CURDIR}/../libmj
-LIBDPLIBS+= netpgp ${.CURDIR}/../lib
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-
-MAN= libpaa.3
-WARNS= 4
-
-.PATH: ${.CURDIR}/../dist/src/pgp2ssh ${.CURDIR}/../dist/src/libpaa
-
-INCS+= libpaa.h
-INCSDIR=/usr/include
-
-.include <bsd.lib.mk>
-
-SUBDIR+= client server
-
-.include <bsd.subdir.mk>
-
-t:
- server/paaserver -r authentication%bigco.com@localhost
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libpaa/client/Makefile
--- a/crypto/external/bsd/netpgp/libpaa/client/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/09/10 05:30:28 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG= paaclient
-#BINDIR= /usr/bin
-
-SRCS= b64.c libpaa.c client.c
-CPPFLAGS+= -I${.CURDIR}/../../dist/include -I${.CURDIR}/../../dist/src/pgp2ssh
-
-LDADD+= -lmj -lnetpgp -lcrypto -lz -lbz2
-MKMAN=no
-WARNS= 0
-
-.PATH: ${.CURDIR}/../../dist/src/libpaa ${.CURDIR}/../../dist/src/pgp2ssh
-
-.include <bsd.prog.mk>
-
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libpaa/server/Makefile
--- a/crypto/external/bsd/netpgp/libpaa/server/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2010/09/10 05:30:28 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG= paaserver
-#BINDIR= /usr/bin
-
-SRCS= b64.c libpaa.c server.c
-CPPFLAGS+= -I${.CURDIR}/../../dist/include -I${.CURDIR}/../../dist/src/pgp2ssh
-
-LDADD+= -lmj -lnetpgp -lcrypto -lz -lbz2
-MKMAN=no
-WARNS= 0
-
-.PATH: ${.CURDIR}/../../dist/src/libpaa ${.CURDIR}/../../dist/src/pgp2ssh
-
-.include <bsd.prog.mk>
-
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/libpaa/shlib_version
--- a/crypto/external/bsd/netpgp/libpaa/shlib_version Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-major=0
-minor=0
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/netpgp/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/09/01 06:02:58 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG= netpgp
-BINDIR= /usr/bin
-
-CPPFLAGS+= -I${.CURDIR}/../dist/include
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPDIR} -lnetpgp
-DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+= -L${LIBMJDIR} -lmj
-DPADD+= ${LIBMJDIR}/libmj.a
-
-LDADD+= -lcrypto -lz -lbz2
-DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-MAN= netpgp.1
-
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
-.PATH: ${.CURDIR}/../dist/src/netpgp
-
-.include <bsd.prog.mk>
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/netpgpkeys/Makefile
--- a/crypto/external/bsd/netpgp/netpgpkeys/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2010/09/02 06:00:12 agc Exp $
-
-.include <bsd.own.mk>
-
-PROG= netpgpkeys
-SRCS= netpgpkeys.c
-BINDIR= /usr/bin
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPDIR} -lnetpgp
-DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+= -L${LIBMJDIR} -lmj
-DPADD+= ${LIBMJDIR}/libmj.a
-
-LDADD+= -lcrypto -lz -lbz2
-DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-MAN= netpgpkeys.1
-
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
-.PATH: ${.CURDIR}/../dist/src/netpgpkeys
-
-.include <bsd.prog.mk>
diff -r 56840510b004 -r e3314cc6fca8 crypto/external/bsd/netpgp/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/netpgpverify/Makefile Sun May 06 18:08:12 2012 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2010/08/13 05:16:28 he Exp $
-
-.include <bsd.own.mk>
-
-PROG= netpgpverify
-BINDIR= /usr/bin
-SRCS= verify.c
-
-CPPFLAGS+= -I${.CURDIR}/../dist/include -I${.CURDIR}/../lib
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+= -L${LIBNETPGPDIR} -lnetpgp
-DPADD+= ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!= cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+= -L${LIBMJDIR} -lmj
-DPADD+= ${LIBMJDIR}/libmj.a
-
-LDADD+= -lcrypto -lz -lbz2
-DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-MAN= netpgpverify.1
-
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/src/netpgpverify
-
-.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index