From 1edb5b423dbfe17e8b5bbaaa4582416e1cac0e69 Mon Sep 17 00:00:00 2001 From: Hiroshi Shirosaki Date: Fri, 20 Jun 2014 10:25:53 +0900 Subject: [PATCH] Add msys crypt-1.1-1 for OpenSSL dependency --- src/crypt/.gitignore | 1 + src/crypt/patches/0001-crypt-1.1_1-3-msys.patch | 63 +++++++++++++++++++++++++ src/crypt/release.sh | 40 ++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 src/crypt/.gitignore create mode 100644 src/crypt/patches/0001-crypt-1.1_1-3-msys.patch create mode 100644 src/crypt/release.sh diff --git a/src/crypt/.gitignore b/src/crypt/.gitignore new file mode 100644 index 00000000..f9e42d25 --- /dev/null +++ b/src/crypt/.gitignore @@ -0,0 +1 @@ +/crypt-* diff --git a/src/crypt/patches/0001-crypt-1.1_1-3-msys.patch b/src/crypt/patches/0001-crypt-1.1_1-3-msys.patch new file mode 100644 index 00000000..0cef9777 --- /dev/null +++ b/src/crypt/patches/0001-crypt-1.1_1-3-msys.patch @@ -0,0 +1,63 @@ +From 35367c17a3f987c8d83ebed4ce72f9b6816198d0 Mon Sep 17 00:00:00 2001 +From: Hiroshi Shirosaki +Date: Fri, 20 Jun 2014 10:45:32 +0900 +Subject: [PATCH] crypt-1.1_1-3-msys + +Based on the patch in crypt-1.1_1-3-msys-1.0.13-src.tar.lzma. +Remove COPYING. +--- + Makefile | 11 +++++++---- + crypt.README | 3 +++ + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index d1e429a..c248b55 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,25 +11,28 @@ DLLVER=0 + EXE=.exe + + STATICLIB=libcrypt.a +-SHAREDLIB=cygcrypt-$(DLLVER).dll ++SHAREDLIB=msys-crypt-$(DLLVER).dll + IMPORTLIB=libcrypt.dll.a + + APPS=crypt$(EXE) + LIBS=$(STATICLIB) $(SHAREDLIB) + ++%.o : %.c ++ $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< ++ + all: $(APPS) $(LIBS) + + crypt$(EXE): crypt.o $(LIBS) +- $(CC) -static -o $@ crypt.o -L. -lcrypt ++ $(CC) $(LDFLAGS) -o $@ crypt.o libcrypt.a + + $(STATICLIB): encrypt.o + ar rv $@ encrypt.o + + $(SHAREDLIB): encrypt.o +- $(CC) -shared -Wl,--out-implib=$(IMPORTLIB) -Wl,--export-all \ ++ $(CC) $(LDFLAGS) -shared -Wl,--out-implib=$(IMPORTLIB) -Wl,--export-all \ + $^ -o $@ + +-encrypt.o: encrypt.h ++encrypt.o: encrypt.c encrypt.h + + distclean: clean + +diff --git a/crypt.README b/crypt.README +index d7ee763..1106e81 100644 +--- a/crypt.README ++++ b/crypt.README +@@ -1,3 +1,6 @@ ++CYGWIN-SPECIFIC README ++====================== ++ + This is the DES-crypt package Version 1.1 + + It provides a static library libcrypt.a as well as a shared library +-- +1.9.4.msysgit.0 + diff --git a/src/crypt/release.sh b/src/crypt/release.sh new file mode 100644 index 00000000..c455b1ad --- /dev/null +++ b/src/crypt/release.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +cd "$(dirname "$0")" && . ../common/update-lib.sh + +check_pristine + +package=crypt +version=1.1-1 +url=http://mirrors.kernel.org/sourceware/cygwin/x86/release/crypt/ +d=crypt-$version +tar=$d-src.tar.bz2 + +download && +extract && +apply_patches + +# update index +FILELIST=fileList.txt + +pre_install + +opt_flags="-O3 -s -march=i386" +export CFLAGS=${CFLAGS:-"${opt_flags}"} +export CPPFLAGS="${CPPFLAGS} -D__CYGWIN__" +export LDFLAGS="${LDFLAGS} -Wl,--enable-auto-import" + +(cd $d && + make CPPFLAGS="${CPPFLAGS}" \ + CFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" || die "Could not make $FILE" +) + +# install executable files +(cd $d && + install msys-crypt-0.dll /bin/ || die "Could not install" + install libcrypt.dll.a /lib/ || die "Could not install" +) || die "Could not install" + +post_install + -- 2.11.4.GIT