From af5486c6c108c6ae899ea453dbfc6e745d5fc864 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 20 Aug 2011 09:21:39 +0200 Subject: packages gnutls p11-kit dlfcn-win32: rollback p11-kit support Remove pll-kit support because it's not ready for Windows. Crude hacks are too risky since this is security related. dlfcn-win32 isn't needed anymore. --- src/dlfcn-win32-1-fixes.patch | 23 ----------- src/dlfcn-win32.mk | 31 --------------- src/gnutls.mk | 3 +- src/guile.mk | 4 +- src/p11-kit-1-fixes.patch | 88 ------------------------------------------- src/p11-kit.mk | 28 -------------- 6 files changed, 4 insertions(+), 173 deletions(-) delete mode 100644 src/dlfcn-win32-1-fixes.patch delete mode 100644 src/dlfcn-win32.mk delete mode 100644 src/p11-kit-1-fixes.patch delete mode 100644 src/p11-kit.mk diff --git a/src/dlfcn-win32-1-fixes.patch b/src/dlfcn-win32-1-fixes.patch deleted file mode 100644 index cd34515..0000000 --- a/src/dlfcn-win32-1-fixes.patch +++ /dev/null @@ -1,23 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From 5c32340c7e89fc36c881de1ee8872df32e2cb91d Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 17 Aug 2011 21:58:39 +0200 -Subject: [PATCH] let configure succeed - - -diff --git a/configure b/configure -index 3ae2f88..a16c7eb 100755 ---- a/configure -+++ b/configure -@@ -190,3 +190,4 @@ enabled shared && { - echo "msvc: $msvc"; - echo "strip: $stripping"; - } -+true --- -1.7.6 - diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk deleted file mode 100644 index 2559b39..0000000 --- a/src/dlfcn-win32.mk +++ /dev/null @@ -1,31 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -# dlfcn-win32 -PKG := dlfcn-win32 -$(PKG)_IGNORE := -$(PKG)_VERSION := r19 -$(PKG)_CHECKSUM := a0033e37a547c52059d0bf8664a96ecdeeb66419 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_WEBSITE := http://code.google.com/p/dlfcn-win32/ -$(PKG)_URL := http://$(PKG).googlecode.com/files/$($(PKG)_FILE) -$(PKG)_DEPS := gcc - -define $(PKG)_UPDATE - wget -q -O- 'http://code.google.com/p/dlfcn-win32/downloads/list?sort=-uploaded' | \ - $(SED) -n 's,.*dlfcn-win32-\(r[0-9][^<]*\)\.tar.*,\1,p' | \ - head -1 -endef - -define $(PKG)_BUILD - cd '$(1)' && ./configure \ - --prefix='$(PREFIX)/$(TARGET)' \ - --incdir='$(PREFIX)/$(TARGET)/include' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ - --cross-prefix='$(TARGET)-' \ - --disable-shared \ - --enable-static - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j '$(JOBS)' install -endef diff --git a/src/gnutls.mk b/src/gnutls.mk index 7c8062d..086319b 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -10,7 +10,7 @@ $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ $(PKG)_URL := ftp://ftp.gnutls.org/pub/gnutls/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnupg.org/gcrypt/gnutls/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib libgcrypt p11-kit +$(PKG)_DEPS := gcc zlib libgcrypt define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=gnutls.git;a=tags' | \ @@ -37,6 +37,7 @@ define $(PKG)_BUILD --with-included-pakchois \ --with-libgcrypt \ --without-lzo \ + --without-p11-kit LIBS='-lz' $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= defexec_DATA= endef diff --git a/src/guile.mk b/src/guile.mk index ffb132a..3dbc62e 100644 --- a/src/guile.mk +++ b/src/guile.mk @@ -10,7 +10,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG)/ $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libtool gmp libiconv gettext libunistring gc libffi readline dlfcn-win32 +$(PKG)_DEPS := gcc libtool gmp libiconv gettext libunistring gc libffi readline define $(PKG)_UPDATE wget -q -O- 'http://git.savannah.gnu.org/gitweb/?p=$(PKG).git;a=tags' | \ @@ -30,7 +30,7 @@ define $(PKG)_BUILD --disable-shared \ --without-threads \ scm_cv_struct_timespec=no \ - LIBS='-lunistring -lintl -liconv -ldl' \ + LIBS='-lunistring -lintl -liconv' \ CFLAGS='-Wno-unused-but-set-variable' $(MAKE) -C '$(1)' -j '$(JOBS)' schemelib_DATA= $(MAKE) -C '$(1)' -j 1 install schemelib_DATA= diff --git a/src/p11-kit-1-fixes.patch b/src/p11-kit-1-fixes.patch deleted file mode 100644 index 1a2d962..0000000 --- a/src/p11-kit-1-fixes.patch +++ /dev/null @@ -1,88 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -Contains ad hoc patches for cross building. - -From 3d4e0e4f8a2dda773cd264b113ac8a61e913a9d5 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 17 Aug 2011 21:25:23 +0200 -Subject: [PATCH 1/3] no pwd.h for windows - - -diff --git a/p11-kit/conf.c b/p11-kit/conf.c -index 55e0268..d9aaf69 100644 ---- a/p11-kit/conf.c -+++ b/p11-kit/conf.c -@@ -50,7 +50,9 @@ - #include - #include - #include -+#ifndef _WIN32 - #include -+#endif - #include - #include - #include -@@ -338,6 +340,7 @@ expand_user_path (const char *path) - env = getenv ("HOME"); - if (env && env[0]) { - return strconcat (env, path + 1, NULL); -+#ifndef _WIN32 - } else { - pwd = getpwuid (getuid ()); - if (!pwd) { -@@ -348,6 +351,7 @@ expand_user_path (const char *path) - return NULL; - } - return strconcat (pwd->pw_dir, path + 1, NULL); -+#endif - } - } - --- -1.7.6 - - -From db04a7c8720f46f1e30a97033e1368245818ff8c Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 17 Aug 2011 21:43:11 +0200 -Subject: [PATCH 2/3] no pthread_atfork for windows - - -diff --git a/p11-kit/modules.c b/p11-kit/modules.c -index 97fb58f..0d22aa5 100644 ---- a/p11-kit/modules.c -+++ b/p11-kit/modules.c -@@ -522,7 +522,9 @@ init_globals_unlocked (void) - if (once) - return CKR_OK; - -+#ifndef _WIN32 - pthread_atfork (NULL, NULL, reinitialize_after_fork); -+#endif - once = 1; - - return CKR_OK; --- -1.7.6 - - -From 62cee086ce38db2a2570ae63e6ab4a2fa593aee2 Mon Sep 17 00:00:00 2001 -From: mingw-cross-env -Date: Wed, 17 Aug 2011 21:41:45 +0200 -Subject: [PATCH 3/3] add Libs.private for static linking - - -diff --git a/p11-kit/p11-kit-1.pc.in b/p11-kit/p11-kit-1.pc.in -index 9ef67a3..1fcf860 100644 ---- a/p11-kit/p11-kit-1.pc.in -+++ b/p11-kit/p11-kit-1.pc.in -@@ -15,4 +15,5 @@ Name: p11-kit - Description: Library and proxy module for properly loading and sharing PKCS#11 modules. - Version: @VERSION@ - Libs: -L${libdir} -lp11-kit -+Libs.private: -ldl -lintl -liconv -lpthread - Cflags: -I${includedir}/p11-kit-1 --- -1.7.6 - diff --git a/src/p11-kit.mk b/src/p11-kit.mk deleted file mode 100644 index 9413954..0000000 --- a/src/p11-kit.mk +++ /dev/null @@ -1,28 +0,0 @@ -# This file is part of mingw-cross-env. -# See doc/index.html for further information. - -# p11-kit -PKG := p11-kit -$(PKG)_IGNORE := -$(PKG)_VERSION := 0.4 -$(PKG)_CHECKSUM := e12c6918e5de9f26f197bcc1a274bbfbf24efe06 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_WEBSITE := http://p11-glue.freedesktop.org/ -$(PKG)_URL := http://p11-glue.freedesktop.org/releases/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dlfcn-win32 - -define $(PKG)_UPDATE - wget -q -O- 'http://cgit.freedesktop.org/p11-glue/p11-kit/refs/tags' | \ - $(SED) -n "s,.*