bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add opencdk update patch by Simon Josefsson (#2399)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8859 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2007-09-20 09:14:15 +00:00
parent 16e3b23b6a
commit 7d5571c2ea
3 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/opencdk/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006 OpenWrt.org
# Copyright (C) 2006, 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=opencdk
PKG_VERSION:=0.5.5
PKG_VERSION:=0.6.4
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -18,7 +18,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
http://www.mirrors.wiretapped.net/security/network-security/gnutls/opencdk/ \
ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/opencdk/ \
http://josefsson.org/gnutls/releases/opencdk/
PKG_MD5SUM:=aaff60107f0153873192ffda00699a96
PKG_MD5SUM:=7bfc820bcdc08f0c31f860710368071e
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/libopencdk
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libgcrypt
DEPENDS:=+libgcrypt zlib
TITLE:=The Open Crypto Development Kit library
DESCRIPTION:=\
This library provides basic parts of the OpenPGP message format.\\\
@ -41,14 +41,6 @@ define Package/libopencdk
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); touch \
configure.ac \
acinclude.m4 \
aclocal.m4 \
Makefile.in \
config.h.in \
configure \
);
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \

24
libs/opencdk/patches/100-fix-tests-build Normal file
View File

@ -0,0 +1,24 @@
diff -ur opencdk-0.6.4-/tests/Makefile.am opencdk-0.6.4/tests/Makefile.am
--- opencdk-0.6.4-/tests/Makefile.am 2007-06-11 12:16:37.000000000 +0200
+++ opencdk-0.6.4/tests/Makefile.am 2007-09-13 19:54:03.000000000 +0200
@@ -33,7 +33,7 @@
CLEANFILES = plain-test
-LDADD = ../src/libopencdk.la
+LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
if HAVE_W32_SYSTEM
# there is a problem with some tests and WINE
diff -ur opencdk-0.6.4-/tests/Makefile.in opencdk-0.6.4/tests/Makefile.in
--- opencdk-0.6.4-/tests/Makefile.in 2007-06-11 12:25:38.000000000 +0200
+++ opencdk-0.6.4/tests/Makefile.in 2007-09-13 19:54:21.000000000 +0200
@@ -257,7 +257,7 @@
AM_LDFLAGS = -no-install
AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
CLEANFILES = plain-test
-LDADD = ../src/libopencdk.la
+LDADD = ../src/libopencdk.la $(LIBGCRYPT_LIBS)
noinst_HEADER = t-support.h
all: all-am

28
libs/opencdk/patches/500-cross-compile.patch
View File

@ -1,28 +0,0 @@
diff -ruN opencdk-0.5.5-orig/configure opencdk-0.5.5-1/configure
--- opencdk-0.5.5-orig/configure 2004-06-20 15:54:29.000000000 +0200
+++ opencdk-0.5.5-1/configure 2005-03-15 22:36:53.000000000 +0100
@@ -19788,8 +19788,8 @@
-LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
-LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
diff -ruN opencdk-0.5.5-orig/configure.ac opencdk-0.5.5-1/configure.ac
--- opencdk-0.5.5-orig/configure.ac 2004-06-05 19:46:31.000000000 +0200
+++ opencdk-0.5.5-1/configure.ac 2005-03-15 22:36:26.000000000 +0100
@@ -96,8 +96,8 @@
***
]]))
-LIBOPENCDK_LIBS="$LIBS -L${libdir} -lopencdk $LIBGCRYPT_LIBS"
-LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
+LIBOPENCDK_LIBS="$LIBS -lopencdk $LIBGCRYPT_LIBS"
+LIBOPENCDK_CFLAGS="$LIBGCRYPT_CFLAGS"
AC_SUBST(LIBOPENCDK_LIBS)
AC_SUBST(LIBOPENCDK_CFLAGS)