move more extra packages from ./trunk to ./packages

[openwrt.git] / package / isakmpd / patches / 020-standardize.patch

diff --git a/package/isakmpd/patches/020-standardize.patch b/package/isakmpd/patches/020-standardize.patch
deleted file mode 100644 (file)
index 435782b..0000000
--- a/package/isakmpd/patches/020-standardize.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: isakmpd-20041012.orig/GNUmakefile
-===================================================================
---- isakmpd-20041012.orig.orig/GNUmakefile     2007-06-04 13:22:39.283883224 +0200
-+++ isakmpd-20041012.orig/GNUmakefile  2007-06-04 13:22:39.722816496 +0200
-@@ -168,7 +168,6 @@
- X509=         x509.c
- CFLAGS+=      -DUSE_LIBCRYPTO
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- endif
- 
- ifdef USE_RAWKEY
-@@ -242,3 +241,16 @@
- 
- realcleandepend:
-       rm -f .depend tags
-+
-+# Install rules
-+install: install-bin install-man
-+
-+install-bin: isakmpd
-+      -mkdir -p $(DESTDIR)$(BINDIR)
-+      $(INSTALL) $(INSTALL_OPTS) -m 755 isakmpd $(DESTDIR)$(BINDIR)
-+
-+install-man:
-+      -mkdir -p $(DESTDIR)$(MANDIR)/man8
-+      $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.8 $(DESTDIR)$(MANDIR)/man8
-+      -mkdir -p $(DESTDIR)$(MANDIR)/man5
-+      $(INSTALL) $(INSTALL_OPTS) -m 444 isakmpd.conf.5 isakmpd.policy.5 $(DESTDIR)$(MANDIR)/man5
-Index: isakmpd-20041012.orig/samples/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/samples/Makefile        2007-06-04 13:22:39.015923960 +0200
-+++ isakmpd-20041012.orig/samples/Makefile     2007-06-04 13:22:39.722816496 +0200
-@@ -26,7 +26,7 @@
- #
- 
- FILES=                VPN-* policy singlehost-*
--TARGETDIR=    /usr/share/ipsec/isakmpd
-+TARGETDIR=    /usr/share/isakmpd/samples
- 
- # The mkdir below is for installation on OpenBSD pre 2.7
- install:
-Index: isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep
-===================================================================
---- isakmpd-20041012.orig.orig/sysdep/linux/GNUmakefile.sysdep 2007-06-04 13:22:39.291882008 +0200
-+++ isakmpd-20041012.orig/sysdep/linux/GNUmakefile.sysdep      2007-06-04 13:22:39.722816496 +0200
-@@ -25,18 +25,18 @@
- # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
- 
--LIBGMP:=      /usr/lib/libgmp.a
--LIBCRYPTO:=   /usr/lib/libcrypto.a
-+LIBGMP:=
-+LIBCRYPTO:=   -lcrypto
- LIBSYSDEPDIR:=        ${.CURDIR}/sysdep/common/libsysdep
- LIBSYSDEP:=   ${LIBSYSDEPDIR}/libsysdep.a
- 
--LDADD+=               -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
-+LDADD+=               $(EXTRA_LDFLAGS) -lgmp ${LIBSYSDEP} ${LIBCRYPTO}
- DPADD+=               ${LIBGMP} ${LIBSYSDEP}
- 
- CFLAGS+=      -DHAVE_GETNAMEINFO -DUSE_OLD_SOCKADDR -DHAVE_PCAP \
-               -DNEED_SYSDEP_APP -DMP_FLAVOUR=MP_FLAVOUR_GMP -DUSE_AES \
-               -I${.CURDIR}/sysdep/linux/include -I${.CURDIR}/sysdep/common \
--              -I/usr/include/openssl
-+              $(EXTRA_CPPFLAGS)
- 
- FEATURES=     debug tripledes blowfish cast ec aggressive x509 policy
- FEATURES+=    dpd nat_traversal isakmp_cfg des aes
-Index: isakmpd-20041012.orig/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/Makefile        2007-06-04 13:22:39.028921984 +0200
-+++ isakmpd-20041012.orig/Makefile     2007-06-04 13:22:39.723816344 +0200
-@@ -147,7 +147,6 @@
- .ifdef USE_LIBCRYPTO
- CFLAGS+=      -DUSE_LIBCRYPTO
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- .endif
- 
- .ifdef USE_LIBDES
-Index: isakmpd-20041012.orig/apps/certpatch/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/apps/certpatch/Makefile 2007-06-04 13:22:39.035920920 +0200
-+++ isakmpd-20041012.orig/apps/certpatch/Makefile      2007-06-04 13:22:39.723816344 +0200
-@@ -40,7 +40,6 @@
- .PATH:                ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ}
- CFLAGS+=      -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- MAN=          certpatch.8
- 
- .if ${FEATURES:Mgmp} == "gmp"
-Index: isakmpd-20041012.orig/regress/crypto/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/regress/crypto/Makefile 2007-06-04 13:22:39.041920008 +0200
-+++ isakmpd-20041012.orig/regress/crypto/Makefile      2007-06-04 13:22:39.723816344 +0200
-@@ -13,7 +13,7 @@
-               -DUSE_TRIPLEDES -DUSE_CAST -DUSE_BLOWFISH -DUSE_DES \
-               -DUSE_AES
- LDADD+=               -lcrypto -ldes
--DPADD+=               ${LIBCRYPTO} ${LIBDES}
-+DPADD+=               ${LIBDES}
- NOMAN=
- DEBUG=                -g
- 
-Index: isakmpd-20041012.orig/regress/dh/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/regress/dh/Makefile     2007-06-04 13:22:39.048918944 +0200
-+++ isakmpd-20041012.orig/regress/dh/Makefile  2007-06-04 13:22:39.726815888 +0200
-@@ -15,7 +15,6 @@
-               -DUSE_EC
- NOMAN=
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- DEBUG=                -g
- 
- .if ${FEATURES:Mgmp} == "gmp"
-Index: isakmpd-20041012.orig/regress/group/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/regress/group/Makefile  2007-06-04 13:22:39.054918032 +0200
-+++ isakmpd-20041012.orig/regress/group/Makefile       2007-06-04 13:22:39.727815736 +0200
-@@ -15,7 +15,6 @@
-               -DUSE_EC
- NOMAN=
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- DEBUG=                -g
- 
- .if ${FEATURES:Mgmp} == "gmp"
-Index: isakmpd-20041012.orig/regress/rsakeygen/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/regress/rsakeygen/Makefile      2007-06-04 13:22:39.060917120 +0200
-+++ isakmpd-20041012.orig/regress/rsakeygen/Makefile   2007-06-04 13:22:39.727815736 +0200
-@@ -62,7 +62,6 @@
- .ifdef USE_LIBCRYPTO
- CFLAGS+=      -DUSE_LIBCRYPTO
- LDADD+=               -lcrypto
--DPADD+=               ${LIBCRYPTO}
- .endif
- 
- .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO)
-Index: isakmpd-20041012.orig/regress/x509/Makefile
-===================================================================
---- isakmpd-20041012.orig.orig/regress/x509/Makefile   2007-06-04 13:22:39.068915904 +0200
-+++ isakmpd-20041012.orig/regress/x509/Makefile        2007-06-04 13:22:39.727815736 +0200
-@@ -78,7 +78,6 @@
- X509=         x509.c
- CFLAGS+=      -DUSE_LIBCRYPTO
- LDADD+=               -lcrypto ${LIBLWRES}
--DPADD+=               ${LIBCRYPTO}
- .endif
- 
- .if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO) || !defined (USE_KEYNOTE)