diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/openssl-pkcs11 | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/openssl-pkcs11')
| -rw-r--r-- | package/openssl-pkcs11/Makefile | 12 | ||||
| -rw-r--r-- | package/openssl-pkcs11/ipkg/openssl-pkcs11.control | 4 | ||||
| -rw-r--r-- | package/openssl-pkcs11/patches/patch-configure | 60 |
3 files changed, 8 insertions, 68 deletions
diff --git a/package/openssl-pkcs11/Makefile b/package/openssl-pkcs11/Makefile index 6f7036f72..283fa911c 100644 --- a/package/openssl-pkcs11/Makefile +++ b/package/openssl-pkcs11/Makefile @@ -6,16 +6,20 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl-pkcs11 -PKG_VERSION:= 0.1.3 +PKG_VERSION:= 0.1.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 26eb84950a10b7d869e41a50620ebf09 +PKG_MD5SUM:= 840af6e54dc21445c54f74e15005ba4d +PKG_DESCR:= pkcs11 engine for openssl +PKG_SECTION:= crypto +PKG_URL:= http://www.opensc-project.org/engine_pkcs11 +PKG_SITES:= http://www.opensc-project.org/files/engine_pkcs11/ + DISTFILES:= engine_pkcs11-${PKG_VERSION}.tar.gz -MASTER_SITES:= http://www.opensc-project.org/files/engine_pkcs11/ WRKDIST= ${WRKDIR}/engine_pkcs11-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,OPENSSL_PKCS11,openssl-pkcs11,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OPENSSL_PKCS11,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= cross_compiling=yes diff --git a/package/openssl-pkcs11/ipkg/openssl-pkcs11.control b/package/openssl-pkcs11/ipkg/openssl-pkcs11.control deleted file mode 100644 index 3e7c3ae5b..000000000 --- a/package/openssl-pkcs11/ipkg/openssl-pkcs11.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: openssl-pkcs11 -Priority: optional -Section: crypto -Description: pkcs11 engine for openssl diff --git a/package/openssl-pkcs11/patches/patch-configure b/package/openssl-pkcs11/patches/patch-configure deleted file mode 100644 index 7527e4904..000000000 --- a/package/openssl-pkcs11/patches/patch-configure +++ /dev/null @@ -1,60 +0,0 @@ -$Id$ ---- engine_pkcs11-0.1.3.orig/configure 2005-11-23 21:44:23.000000000 +0100 -+++ engine_pkcs11-0.1.3/configure 2007-04-08 14:22:29.000000000 +0200 -@@ -20061,56 +20061,6 @@ if test "${with_openssl+set}" = set; the - fi - CPPFLAGS="-I$withval/include $saved_CPPFLAGS" - -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --#include <string.h> --#include <openssl/rand.h> --int main(void) --{ -- char a[2048]; -- memset(a, 0, sizeof(a)); -- RAND_add(a, sizeof(a), sizeof(a)); -- return(RAND_status() <= 0); --} -- --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- -- SSL_MSG="yes" -- ssldir="$withval" -- break -- --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -- - else - - |