From 1a6874c72039b447f05d53694c4f51938cd67457 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Fri, 10 Jan 2014 22:16:40 +0100 Subject: app-crypt/openssl-af-alg: Move to git-r3, check kernel prerequisities since 9b39696e0f, add USE flag debug, strip long lines, refresh patch set Package-Manager: portage-2.2.8 --- app-crypt/openssl-af-alg/ChangeLog | 17 ++- app-crypt/openssl-af-alg/Manifest | 15 ++- .../openssl-af-alg/files/0000-cover-letter.patch | 26 ---- ...ile-to-build-easily-OpenSSL-engine-AF_ALG.patch | 147 --------------------- ...UILD-Use-CC-instead-of-LD-to-link-library.patch | 35 +++++ ...-Add-a-.gitignore-to-ignore-builded-files.patch | 24 ---- ...D-Do-not-override-variable-if-already-def.patch | 54 ++++++++ .../0003-Fix-warnings-on-Wunused-parameter.patch | 89 ------------- ...R-BUILD-Comment-some-Makefile-tips-usages.patch | 44 ++++++ ...NOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch | 34 +++++ .../files/0004-Strip-whitespaces.patch | 67 ---------- .../0005-MEDIUM-BUILD-Implement-make-install.patch | 56 ++++++++ ...-The-usage-of-Tab-is-recommenced-in-Makef.patch | 69 ++++++++++ .../openssl-af-alg/openssl-af-alg-9999.ebuild | 31 +++-- 14 files changed, 339 insertions(+), 369 deletions(-) delete mode 100644 app-crypt/openssl-af-alg/files/0000-cover-letter.patch delete mode 100644 app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch create mode 100644 app-crypt/openssl-af-alg/files/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch delete mode 100644 app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch create mode 100644 app-crypt/openssl-af-alg/files/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch delete mode 100644 app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch create mode 100644 app-crypt/openssl-af-alg/files/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch create mode 100644 app-crypt/openssl-af-alg/files/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch delete mode 100644 app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch create mode 100644 app-crypt/openssl-af-alg/files/0005-MEDIUM-BUILD-Implement-make-install.patch create mode 100644 app-crypt/openssl-af-alg/files/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch (limited to 'app-crypt') diff --git a/app-crypt/openssl-af-alg/ChangeLog b/app-crypt/openssl-af-alg/ChangeLog index e98e0818..3c276d6f 100644 --- a/app-crypt/openssl-af-alg/ChangeLog +++ b/app-crypt/openssl-af-alg/ChangeLog @@ -1,7 +1,22 @@ # ChangeLog for app-crypt/openssl-af-alg -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Jan 2014; Bertrand Jacquin + +files/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch, + +files/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch, + +files/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch, + +files/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch, + +files/0005-MEDIUM-BUILD-Implement-make-install.patch, + +files/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch, + -files/0000-cover-letter.patch, + -files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch, + -files/0002-Add-a-.gitignore-to-ignore-builded-files.patch, + -files/0003-Fix-warnings-on-Wunused-parameter.patch, + -files/0004-Strip-whitespaces.patch, openssl-af-alg-9999.ebuild: + app-crypt/openssl-af-alg: Move to git-r3, check kernel prerequisities since + 9b39696e0f, add USE flag debug, strip long lines, refresh patch set + 15 Jun 2013; Bertrand Jacquin files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch, files/0002-Add-a-.gitignore-to-ignore-builded-files.patch, diff --git a/app-crypt/openssl-af-alg/Manifest b/app-crypt/openssl-af-alg/Manifest index 41ee4412..a2822bb6 100644 --- a/app-crypt/openssl-af-alg/Manifest +++ b/app-crypt/openssl-af-alg/Manifest @@ -1,8 +1,9 @@ -AUX 0000-cover-letter.patch 765 SHA256 a067362841c7a0072eec21c0bf3c1ee8ff820f807fc1d55f76a5580763294f67 WHIRLPOOL 4863cd3558a40bcec7bf0d2f70b1e98a19087e536bb7640ecb83d0bd0b6ecaafe3561f36804faf987eb2626f551d4a84628029bd446507752d090205fdc5ddd2 -AUX 0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch 3117 SHA256 875f46c31eab2d268b742c1dc28728dc0f5a2013fa2d2ce492706f73f0614991 WHIRLPOOL e945b8bcd74d05cceacf3fa82fd1a831c24e87520f719b4a31baafc8190039728ad52e711d0fd27b8c6b989db49f705603fbe2f16b38422514fcf028e8c4e377 -AUX 0002-Add-a-.gitignore-to-ignore-builded-files.patch 489 SHA256 431de08a3d3f5227f1e8337c60f3d808bf258c521ab701fc95c38ed22b6d8c5f WHIRLPOOL 64bdc0eee40be075e8efc96301552854a25d6a6f40183e1f10b6e5e035a690cb2c13325b4d3235a70ff11760a9ecae7856000df541c31fed51ce0e1441e3f59d -AUX 0003-Fix-warnings-on-Wunused-parameter.patch 2814 SHA256 da6f91059f3a4a814fde57439c03e022136e63b89fdf319cdb71248f27af0b8f WHIRLPOOL 77eaa85f817935ccb207bc083921d6d1c4a4807101ca11ff50d379601a0bc26bae99357e48e08c58261ffa8df30f2784c1b7066b20a16a5cdff8e7c1b02e831b -AUX 0004-Strip-whitespaces.patch 2048 SHA256 9b33ebd40a6418b797e3fbcd92cd11f2570503bfe3c64b1c77b968e9bf802a8d WHIRLPOOL b20e8219fff231bc8720cc4729e6a666c2ef6caabe7d151cf07e42e0471035cf7c7d75940f129ca3b5992459f2955f3802e60c80059445ba5e4afc11cac1789d -EBUILD openssl-af-alg-9999.ebuild 830 SHA256 858724109e4539161a91af54ed3c567f7ebda515f713e94016f0f7ec4ca0f555 WHIRLPOOL 5d279ccef90b5c674df501b220a904e8f2ba0448780a382f17d4bfd79192f382732a9a98c23b69a92fdfb9f1a7e34552aae7de8d1bf42c3993cc14d472271179 -MISC ChangeLog 1302 SHA256 d2c589076dcdc681e55717dc30703359b78541e0194d4c49dcec5e6e26212545 WHIRLPOOL c9726288d882aef55e0b34b66127f0b309efb2b80831d305971e9b4d42a6a37fe9c504e4a32d734926804e38a58d0743638e4b934572e9c0ef147905ec3bbe07 +AUX 0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch 917 SHA256 248ffeb4000b7a499bb9647cab9773dd20bda6af5cf4e16b0668b4221275880b WHIRLPOOL 8d0b52fb1512a48cfd38c061135a64f372cd6d60fd3030801cdba603893b70cb868f71ca7b913642959793120e5b814242509d4ec5761d7cd3647f1ac50f7f71 +AUX 0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch 969 SHA256 d1377900e4f850ff6df48328e854fcd4ad91c01ed0dcafad48d1efe4715f8a4d WHIRLPOOL 338bbee773259b5cf902e08ebaffbd70fe9c0481b8bcb0f9e1fdc126440456c30a8ca9772cffc6291be3b71ee008fd58178aabc6825506ba6c794f9bde0dfad6 +AUX 0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch 824 SHA256 7e2bb231ebc5e74cf25a5ba16c965a38723ef9faf675dcf00fa7bb2d23ab0676 WHIRLPOOL 92579ad7094badd32803405d946979a38400ea8533dbe313e5b87ed114cabff13f5c0dabf7777ad31640821430100b380483dadaf1c26bcbd229b7cfdd350f68 +AUX 0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch 834 SHA256 406a92e65cfafcd051b4d545118a59f1adbd0c52887293cf7b750e980022bc1f WHIRLPOOL 87a5c92c98b377a9ec0178be35f9e5e23f777baaf2bd44ff23d5f761b648973a43a929a795fed2ee2439dbadeebcb60ca547590dfd3fab0a23e329089c97f6bb +AUX 0005-MEDIUM-BUILD-Implement-make-install.patch 1339 SHA256 9841ff895163184fe1fd2c5179259361a29fd46424025db1f5f5ae01a1ed7d5c WHIRLPOOL 2d70156d64399cc22a894fe80be30bc88a8662b714fba8217e928cbdde8d2f86536d786ee8681a671d9e2e527d403620ae85c8f6b9009ec65ed2581dece0925a +AUX 0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch 1673 SHA256 b6be5a731d73fb1ae89dd45e9462324cfc91149a80e51051078b0678636b19f6 WHIRLPOOL 36404e1a99bdb06dbd423fe3e44aee4af6ae650e9bba853c70897a452f9d3ed62aa71c12a0097ea68979a99a6c8c5a760aed8bba62f9334d6014127dff883baf +EBUILD openssl-af-alg-9999.ebuild 1602 SHA256 bf1f8fbce55a02c1ea1a03879d349d4855d2fbf676769cc50278cd9567bb6fda WHIRLPOOL 4419c11094a519db708b339b682cf833e7613540d2faa352c2af8e7b51c4890670411d5d0fa6da9a761560990dcdcd0ad2dbf7d55becea04db933435f0357083 +MISC ChangeLog 2204 SHA256 aa653d067c4a316747f6ed1bad0a75c92586a24927070fcf4e0344370f21e21d WHIRLPOOL 743d18b08cf305baccebb2fa98ed67ad9a3026e5ff329d6789681f946eb93c3c958fe969eef74f306f774fe7d6666bd01d29563e4a43524d7b6754b976dee7ce MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae diff --git a/app-crypt/openssl-af-alg/files/0000-cover-letter.patch b/app-crypt/openssl-af-alg/files/0000-cover-letter.patch deleted file mode 100644 index 03099328..00000000 --- a/app-crypt/openssl-af-alg/files/0000-cover-letter.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e8c6a9066666f174f3f66894464350bb1bc1518e Mon Sep 17 00:00:00 2001 -Message-Id: -From: Bertrand Jacquin -Date: Thu, 31 Jan 2013 21:51:11 +0100 -Subject: [PATCH 0/4] *** SUBJECT HERE *** -To: common@carnivore.it -Cc: nepenthesdev@gmail.com - -*** BLURB HERE *** - -Bertrand Jacquin (4): - Add a Makefile to build easily OpenSSL engine AF_ALG. - Add a .gitignore to ignore builded files - Fix warnings on -Wunused-parameter - Strip whitespaces - - .gitignore | 5 +++ - Makefile | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - e_af_alg.c | 32 +++++++++++-------- - 3 files changed, 127 insertions(+), 12 deletions(-) - create mode 100644 .gitignore - create mode 100644 Makefile - --- -1.8.0 - diff --git a/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch b/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch deleted file mode 100644 index 3b23db7e..00000000 --- a/app-crypt/openssl-af-alg/files/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch +++ /dev/null @@ -1,147 +0,0 @@ -From bcab3687be2cac90ac94b02d2d6a5aa4465b9559 Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Thu, 31 Jan 2013 18:27:17 +0100 -Subject: [PATCH 1/4] Add a Makefile to build easily OpenSSL engine AF_ALG. - -Build the project (one of) : - $ make - $ make shared - $ make all - CC e_af_alg.o - LD libaf_alg.so - -Build with verbose output : - $ make V=1 - cc -c -fPIC -O3 -W -Wall -o e_af_alg.o e_af_alg.c - cc -shared -o libaf_alg.so e_af_alg.o -lcrypto - -Build with specific CFLAGS and CC : - $ make CC=i586-pc-linux-gnu-gcc CFLAGS='-march=geode -Os -mmmx -m3dnow -I/data/cross/alix3-i586/firmware/usr/include' - -In this case default one (-fPIC is alway applied). - -Strip library : - $ make strip - STRIP libaf_alg.so.strip - -Build a tar for public release : - $ make dist - TAR e_af_alg-0.tar - XZ e_af_alg-0.txz - -Here, revision is 0 as there is no git tag, but show be replaced with -the git description. - -Signed-off-by: Bertrand Jacquin ---- - Makefile | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 99 insertions(+) - -diff --git Makefile Makefile -new file mode 100644 -index 0000000..1b03e30 ---- /dev/null -+++ Makefile -@@ -0,0 +1,99 @@ -+#!/usr/bin/make -f < -+# -+# (c) 2013 - Bertrand Jacquin -+# -+ -+NAME = libaf_alg -+VERSION = $(shell git describe --tags --dirty=-dev 2> /dev/null) -+ -+SRC = \ -+ e_af_alg.c -+ -+DOC_FILES = \ -+ README -+ -+CFLAGS ?= \ -+ -W -Wall -+ -+SPEC_CFLAGS = \ -+ -fPIC -+ -+LDFLAGS ?= -+ -+SPEC_LDFLAGS = \ -+ -lcrypto -+ -+CC ?= cc -+ -+STRIP ?= strip -+STRIP_FLAGS ?= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id -+ -+INSTALL ?= install -+ -+TAR = tar -+XZ = xz -+ -+RM ?= rm -f -+ -+DESTDIR ?= -+PREFIX ?= /usr/local -+LIBDIR ?= $(PREFIX)/lib/engines -+DOCDIR ?= $(PREFIX)/share/doc/$(NAME) -+ -+ifeq ($(V),) -+ Q = @ -+ -+ qcmd = @printf " %-8s %s\n" "$(1)" "$(2)"; -+endif # $(V) -+ -+all: shared -+ -+shared: $(NAME).so -+dist: $(NAME)-$(VERSION).txz -+ -+%.o: %.c -+ $(call qcmd,CC,$@) -+ $(Q)$(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $< -+ -+$(NAME).so: $(SRC:c=o) -+ $(call qcmd,CC,$@) -+ $(Q)$(CC) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS) -+ -+strip: $(NAME).so -+ $(call qcmd,STRIP,$@) -+ $(Q)$(STRIP) $(STRIP_FLAGS) $< -+ -+install: install-lib -+install-lib: $(DESTDIR)$(LIBDIR)/$(NAME).so -+install-doc: $(addprefix $(DESTDIR)$(DOCDIR)/, $(DOC_FILES)) -+ -+$(DESTDIR)$(LIBDIR)/$(NAME).so: $(NAME).so -+ $(call qcmd,INSTALL,$@) -+ $(Q)$(INSTALL) -D -m 555 $< $@ -+ -+$(DESTDIR)$(DOCDIR)/%: % -+ $(call qcmd,INSTALL,$@) -+ $(Q)$(INSTALL) -D -m 555 $< $@ -+ -+$(NAME)-$(VERSION).tar: $(SRC) $(DOC_FILES) Makefile -+ $(call qcmd,TAR,$@) -+ $(Q)$(TAR) cf $@ \ -+ --transform "s,^,$(NAME)-$(VERSION)/," \ -+ --force-local --numeric-owner \ -+ $^ -+ -+%.txz: %.tar -+ $(call qcmd,XZ,$@) -+ $(Q)$(XZ) -c > $@ < $< -+ -+clean: -+ $(call qcmd,RM,$(SRC:c=o)) -+ $(Q)$(RM) $(SRC:c=o) -+ $(call qcmd,RM,$(NAME).so) -+ $(Q)$(RM) $(NAME).so -+ -+dist-clean: clean -+ $(call qcmd,RM,$(NAME)-$(VERSION).tar) -+ $(Q)$(RM) $(NAME)-$(VERSION).tar -+ $(call qcmd,RM,$(NAME)-$(VERSION).txz) -+ $(Q)$(RM) $(NAME)-$(VERSION).txz --- -1.8.1.5 - diff --git a/app-crypt/openssl-af-alg/files/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch b/app-crypt/openssl-af-alg/files/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch new file mode 100644 index 00000000..d12cc5f1 --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch @@ -0,0 +1,35 @@ +From a44a334feb29c8326478032eb3b6e1fc0ee96cbc Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:31:36 +0100 +Subject: [PATCH 1/6] MEDIUM/BUILD: Use CC instead of LD to link library + +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index e0b69dc..a992458 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,7 +27,6 @@ SPEC_LDFLAGS = \ + -lcrypto + + CC = cc +-LD = $(CC) + + STRIP = strip + STRIP_FLAGS = --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id +@@ -54,8 +53,8 @@ dist: $(NAME)-$(VERSION).txz + $(Q)$(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $< + + $(NAME).so: $(SRC:c=o) +- $(call qcmd,LD,$@) +- $(Q)$(LD) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS) ++ $(call qcmd,CC,$@) ++ $(Q)$(CC) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS) + + $(NAME).so.strip: $(NAME).so + $(call qcmd,STRIP,$@) +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch b/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch deleted file mode 100644 index 7ea7d8f1..00000000 --- a/app-crypt/openssl-af-alg/files/0002-Add-a-.gitignore-to-ignore-builded-files.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5c07c01760b09f4edaed576fa75f4bcb859c969d Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Thu, 31 Jan 2013 18:33:01 +0100 -Subject: [PATCH 2/4] Add a .gitignore to ignore builded files - - -Signed-off-by: Bertrand Jacquin ---- - .gitignore | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git .gitignore .gitignore -new file mode 100644 -index 0000000..f4b275f ---- /dev/null -+++ .gitignore -@@ -0,0 +1,4 @@ -+*.o -+*.so -+*.tar -+*.txz --- -1.8.1.5 - diff --git a/app-crypt/openssl-af-alg/files/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch b/app-crypt/openssl-af-alg/files/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch new file mode 100644 index 00000000..3b660546 --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch @@ -0,0 +1,54 @@ +From 80c9d84bdc3a4410ae7d4dbcbd2b968348ccdab8 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:33:32 +0100 +Subject: [PATCH 2/6] MEDIUM/BUILD: Do not override variable if already + defined. + +That way you can reuse environnement variables +--- + Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/Makefile b/Makefile +index a992458..4457218 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,28 +14,28 @@ SRC = \ + EXTRA_FILES = \ + README + +-CFLAGS = \ ++CFLAGS ?= \ + -O3 \ + -W -Wall -Werror + + SPEC_CFLAGS = \ + -fPIC + +-LDFLAGS = ++LDFLAGS ?= + + SPEC_LDFLAGS = \ + -lcrypto + +-CC = cc ++CC ?= cc + +-STRIP = strip +-STRIP_FLAGS = --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id +- +-RM = rm -f ++STRIP ?= strip ++STRIP_FLAGS ?= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id + + TAR = tar + XZ = xz + ++RM ?= rm -f ++ + ifeq ($(V),) + Q = @ + +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch b/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch deleted file mode 100644 index f45aac22..00000000 --- a/app-crypt/openssl-af-alg/files/0003-Fix-warnings-on-Wunused-parameter.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 9f348b6fa80b154099a94a7efbfc58014a04033e Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Thu, 31 Jan 2013 18:37:03 +0100 -Subject: [PATCH 3/4] Fix warnings on -Wunused-parameter - - -Signed-off-by: Bertrand Jacquin ---- - e_af_alg.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git e_af_alg.c e_af_alg.c -index e253e07..8864523 100644 ---- e_af_alg.c -+++ e_af_alg.c -@@ -96,6 +96,16 @@ static int af_alg_digests(ENGINE *e, const EVP_MD **digest, const int **nids, in - - #define EVP_CIPHER_block_size_CBC AES_BLOCK_SIZE - -+#define HAVE___ATTRIBUTE__ 1 -+ -+#if HAVE___ATTRIBUTE__ -+# define __UNUSED__ __attribute__((unused)) -+# define __U__ __attribute__((unused)) -+#else -+# define __UNUSED__ -+# define __U__ -+#endif /* HAVE___ATTRIBUTE__ */ -+ - static bool nid_in_nids(int nid, int nids[], int num) - { - int i=0; -@@ -129,7 +139,7 @@ static int *af_alg_cipher_nids = NULL; - static int af_alg_cipher_nids_num = 0; - - --int af_alg_init(ENGINE * engine) -+int af_alg_init(ENGINE * engine __U__) - { - int sock; - if((sock = socket(AF_ALG, SOCK_SEQPACKET, 0)) == -1) -@@ -138,7 +148,7 @@ int af_alg_init(ENGINE * engine) - return 1; - } - --int af_alg_finish(ENGINE * engine) -+int af_alg_finish(ENGINE * engine __U__) - { - return 1; - } -@@ -183,7 +193,7 @@ static bool names_to_nids(const char *names, const void*(*by_name)(const char *) - return true; - } - --static int af_alg_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)()) -+static int af_alg_ctrl(ENGINE *e, int cmd, long i __U__, void *p, void (*f)() __U__) - { - OpenSSL_add_all_algorithms(); - switch( cmd ) -@@ -252,7 +262,7 @@ static int af_alg_bind_fn(ENGINE *e, const char *id) - IMPLEMENT_DYNAMIC_CHECK_FN() - IMPLEMENT_DYNAMIC_BIND_FN(af_alg_bind_fn) - --static int af_alg_aes_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv, int enc) -+static int af_alg_aes_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv __U__, int enc __U__) - { - int keylen = EVP_CIPHER_CTX_key_length(ctx); - struct af_alg_cipher_data *acd = (struct af_alg_cipher_data *)ctx->cipher_data; -@@ -382,7 +392,7 @@ static int af_alg_aes_ciphers(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, const - return 1; - } - --static int af_alg_ciphers(ENGINE *e, const EVP_CIPHER **cipher, const int **nids, int nid) -+static int af_alg_ciphers(ENGINE *e __U__, const EVP_CIPHER **cipher, const int **nids, int nid) - { - if( !cipher ) - { -@@ -497,7 +507,7 @@ static const EVP_MD af_alg_##digest##_md = { \ - - DECLARE_MD_SHA(sha1) - --static int af_alg_digests(ENGINE *e, const EVP_MD **digest, const int **nids, int nid) -+static int af_alg_digests(ENGINE *e __U__, const EVP_MD **digest, const int **nids, int nid) - { - if( !digest ) - { --- -1.8.1.5 - diff --git a/app-crypt/openssl-af-alg/files/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch b/app-crypt/openssl-af-alg/files/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch new file mode 100644 index 00000000..33e06ffd --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch @@ -0,0 +1,44 @@ +From b5d9e9503dd54aa7b8c4595d368a04cdab2d239b Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:35:44 +0100 +Subject: [PATCH 3/6] MINOR/BUILD: Comment some Makefile tips/usages + +--- + Makefile | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/Makefile b/Makefile +index 4457218..47853b4 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,6 +6,7 @@ + NAME = libaf_alg + VERSION = $(shell sh -c 'git describe --tags --dirty=-dev 2> /dev/null || echo 0') + ++# List of sources to build + SRC = \ + e_af_alg.c \ + ciphers.c \ +@@ -14,15 +15,19 @@ SRC = \ + EXTRA_FILES = \ + README + ++# User defined CFLAGS + CFLAGS ?= \ + -O3 \ + -W -Wall -Werror + ++# Forced CFLAGS + SPEC_CFLAGS = \ + -fPIC + ++# User defined LDFLAGS + LDFLAGS ?= + ++# Forced LDFLAGS + SPEC_LDFLAGS = \ + -lcrypto + +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/files/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch b/app-crypt/openssl-af-alg/files/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch new file mode 100644 index 00000000..48525dc4 --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch @@ -0,0 +1,34 @@ +From 822eee883be620fd92e7e4431abbc68e81a88699 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:40:46 +0100 +Subject: [PATCH 4/6] MINOR/BUILD: Rename EXTRA_FILES to DOC_FILES + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 47853b4..c24c858 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ SRC = \ + ciphers.c \ + digests.c + +-EXTRA_FILES = \ ++DOC_FILES = \ + README + + # User defined CFLAGS +@@ -65,7 +65,7 @@ $(NAME).so.strip: $(NAME).so + $(call qcmd,STRIP,$@) + $(Q)$(STRIP) $(STRIP_FLAGS) -o $@ $< + +-$(NAME)-$(VERSION).tar: $(SRC) $(EXTRA_FILES) Makefile ++$(NAME)-$(VERSION).tar: $(SRC) $(DOC_FILES) Makefile + $(call qcmd,TAR,$@) + $(Q)$(TAR) cf $@ \ + --transform "s,^,$(NAME)-$(VERSION)/," \ +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch b/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch deleted file mode 100644 index 5f5a71d6..00000000 --- a/app-crypt/openssl-af-alg/files/0004-Strip-whitespaces.patch +++ /dev/null @@ -1,67 +0,0 @@ -From fda2b0dd7bc65e5ec7556fbf59a8d447de8ef7aa Mon Sep 17 00:00:00 2001 -From: Bertrand Jacquin -Date: Thu, 31 Jan 2013 18:38:55 +0100 -Subject: [PATCH 4/4] Strip whitespaces - - -Signed-off-by: Bertrand Jacquin ---- - e_af_alg.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git e_af_alg.c e_af_alg.c -index 8864523..03a0dca 100644 ---- e_af_alg.c -+++ e_af_alg.c -@@ -9,7 +9,7 @@ - * are met: - * - * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -+ * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in -@@ -138,7 +138,6 @@ static int af_alg_digest_all_nids_num = sizeof(af_alg_digest_all_nids)/sizeof(af - static int *af_alg_cipher_nids = NULL; - static int af_alg_cipher_nids_num = 0; - -- - int af_alg_init(ENGINE * engine __U__) - { - int sock; -@@ -266,7 +265,7 @@ static int af_alg_aes_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *key, c - { - int keylen = EVP_CIPHER_CTX_key_length(ctx); - struct af_alg_cipher_data *acd = (struct af_alg_cipher_data *)ctx->cipher_data; -- -+ - struct sockaddr_alg sa = { - .salg_family = AF_ALG, - .salg_type = "skcipher", -@@ -282,7 +281,7 @@ static int af_alg_aes_init_key (EVP_CIPHER_CTX *ctx, const unsigned char *key, c - - if((acd->tfmfd = socket(AF_ALG, SOCK_SEQPACKET, 0)) == -1) - return 0; -- -+ - if( bind(acd->tfmfd, (struct sockaddr*)&sa, sizeof(sa)) == -1 ) - return 0; - -@@ -378,7 +377,7 @@ static int af_alg_aes_ciphers(EVP_CIPHER_CTX *ctx, unsigned char *out_arg, const - - if (read(acd->op, out_arg+done, len) != len) - return 0; -- -+ - /* do not update IV for following chunks */ - msg.msg_controllen = 0; - done += len; -@@ -528,4 +527,3 @@ static int af_alg_digests(ENGINE *e __U__, const EVP_MD **digest, const int **ni - } - return (*digest != NULL); - } -- --- -1.8.1.5 - diff --git a/app-crypt/openssl-af-alg/files/0005-MEDIUM-BUILD-Implement-make-install.patch b/app-crypt/openssl-af-alg/files/0005-MEDIUM-BUILD-Implement-make-install.patch new file mode 100644 index 00000000..3882f81f --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0005-MEDIUM-BUILD-Implement-make-install.patch @@ -0,0 +1,56 @@ +From 700c3a032dc85628cb13c555631da24d59bf4260 Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:49:42 +0100 +Subject: [PATCH 5/6] MEDIUM/BUILD: Implement 'make install' + +--- + Makefile | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/Makefile b/Makefile +index c24c858..d0504d6 100644 +--- a/Makefile ++++ b/Makefile +@@ -36,11 +36,18 @@ CC ?= cc + STRIP ?= strip + STRIP_FLAGS ?= --strip-unneeded -R .comment -R .GCC.command.line -R .note.gnu.build-id + ++INSTALL ?= install ++ + TAR = tar + XZ = xz + + RM ?= rm -f + ++DESTDIR ?= ++PREFIX ?= /usr/local ++LIBDIR ?= $(PREFIX)/lib/engines ++DOCDIR ?= $(PREFIX)/share/doc/$(NAME) ++ + ifeq ($(V),) + Q = @ + +@@ -65,6 +72,20 @@ $(NAME).so.strip: $(NAME).so + $(call qcmd,STRIP,$@) + $(Q)$(STRIP) $(STRIP_FLAGS) -o $@ $< + ++install: install-lib ++install-lib: $(DESTDIR)$(LIBDIR)/$(NAME).so ++install-doc: $(DOC_FILES:%=$(DESTDIR)$(DOCDIR)/%) ++ ++$(DESTDIR)$(LIBDIR)/$(NAME).so: MODE = 0555 ++$(DESTDIR)$(LIBDIR)/$(NAME).so: $(NAME).so ++ $(call qcmd,INSTALL,$@) ++ $(Q)$(INSTALL) -D -m $(MODE) $< $@ ++ ++$(DESTDIR)$(DOCDIR)/%: MODE = 0444 ++$(DESTDIR)$(DOCDIR)/%: % ++ $(call qcmd,INSTALL,$@) ++ $(Q)$(INSTALL) -D -m $(MODE) $< $@ ++ + $(NAME)-$(VERSION).tar: $(SRC) $(DOC_FILES) Makefile + $(call qcmd,TAR,$@) + $(Q)$(TAR) cf $@ \ +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/files/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch b/app-crypt/openssl-af-alg/files/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch new file mode 100644 index 00000000..85c72c59 --- /dev/null +++ b/app-crypt/openssl-af-alg/files/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch @@ -0,0 +1,69 @@ +From 2ab31bfd855454f71899eb8c009bbe66f181419e Mon Sep 17 00:00:00 2001 +From: Bertrand Jacquin +Date: Fri, 10 Jan 2014 21:52:20 +0100 +Subject: [PATCH 6/6] MINOR/BUILD: The usage of Tab is recommenced in Makefiles + +--- + Makefile | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/Makefile b/Makefile +index d0504d6..6cade4f 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,7 @@ ifeq ($(V),) + Q = @ + + qcmd = @printf " %-8s %s\n" "$(1)" "$(2)"; +-endif # $(V) ++endif # $(V) + + all: shared + +@@ -60,7 +60,7 @@ shared: $(NAME).so + strip: $(NAME).so.strip + dist: $(NAME)-$(VERSION).txz + +-%.o: %.c ++%.o: %.c + $(call qcmd,CC,$@) + $(Q)$(CC) -c $(SPEC_CFLAGS) $(CFLAGS) -o $@ $< + +@@ -68,7 +68,7 @@ $(NAME).so: $(SRC:c=o) + $(call qcmd,CC,$@) + $(Q)$(CC) -shared -o $@ $^ $(SPEC_LDFLAGS) $(LDFLAGS) + +-$(NAME).so.strip: $(NAME).so ++$(NAME).so.strip: $(NAME).so + $(call qcmd,STRIP,$@) + $(Q)$(STRIP) $(STRIP_FLAGS) -o $@ $< + +@@ -86,14 +86,14 @@ $(DESTDIR)$(DOCDIR)/%: % + $(call qcmd,INSTALL,$@) + $(Q)$(INSTALL) -D -m $(MODE) $< $@ + +-$(NAME)-$(VERSION).tar: $(SRC) $(DOC_FILES) Makefile ++$(NAME)-$(VERSION).tar: $(SRC) $(DOC_FILES) Makefile + $(call qcmd,TAR,$@) + $(Q)$(TAR) cf $@ \ + --transform "s,^,$(NAME)-$(VERSION)/," \ + --force-local --numeric-owner \ + $^ + +-%.txz: %.tar ++%.txz: %.tar + $(call qcmd,XZ,$@) + $(Q)$(XZ) -c > $@ < $< + +@@ -103,7 +103,7 @@ clean: + $(call qcmd,RM,$(NAME).so) + $(Q)$(RM) $(NAME).so $(NAME).so.strip + +-dist-clean: clean ++dist-clean: clean + $(call qcmd,RM,$(NAME)-$(VERSION).tar) + $(Q)$(RM) $(NAME)-$(VERSION).tar + $(call qcmd,RM,$(NAME)-$(VERSION).txz) +-- +1.8.3.2 + diff --git a/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild b/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild index f7a0c3cf..9d696153 100644 --- a/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild +++ b/app-crypt/openssl-af-alg/openssl-af-alg-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ EAPI=5 -inherit git-2 eutils toolchain-funcs +inherit eutils flag-o-matic git-r3 linux-info toolchain-funcs DESCRIPTION="AF_ALG for OpenSSL" HOMEPAGE="http://src.carnivore.it/users/common/af_alg" @@ -14,20 +14,35 @@ EGIT_COMMIT="HEAD" LICENSE="openssl" SLOT="0" KEYWORDS="" -IUSE="" +IUSE="debug" DEPEND="dev-libs/openssl" RDEPEND="${DEPEND}" +CONFIG_CHECK="~CONFIG_CRYPTO_USER_API + ~CRYPTO_USER_API_HASH + ~CRYPTO_USER_API_SKCIPHER" +WARNING_CONFIG_CRYPTO_USER_API="You must enable CONFIG_CRYPTO_USER_API in your kernel, otherwise ${PN} would not work" +WARNING_CRYPTO_USER_API_HASH="You must enable CRYPTO_USER_API_HASH in your kernel, otherwise ${PN} would not work" +WARNING_CRYPTO_USER_API_SKCIPHER="You must enable CRYPTO_USER_API_SKCIPHER in your kernel, otherwise ${PN} would not work" + src_prepare() { - epatch "${FILESDIR}/0001-Add-a-Makefile-to-build-easily-OpenSSL-engine-AF_ALG.patch" - epatch "${FILESDIR}/0002-Add-a-.gitignore-to-ignore-builded-files.patch" - epatch "${FILESDIR}/0003-Fix-warnings-on-Wunused-parameter.patch" - epatch "${FILESDIR}/0004-Strip-whitespaces.patch" + epatch "${FILESDIR}/0001-MEDIUM-BUILD-Use-CC-instead-of-LD-to-link-library.patch" + epatch "${FILESDIR}/0002-MEDIUM-BUILD-Do-not-override-variable-if-already-def.patch" + epatch "${FILESDIR}/0003-MINOR-BUILD-Comment-some-Makefile-tips-usages.patch" + epatch "${FILESDIR}/0004-MINOR-BUILD-Rename-EXTRA_FILES-to-DOC_FILES.patch" + epatch "${FILESDIR}/0005-MEDIUM-BUILD-Implement-make-install.patch" + epatch "${FILESDIR}/0006-MINOR-BUILD-The-usage-of-Tab-is-recommenced-in-Makef.patch" + + if use debug ; then + einfo "Appending to CFLAGS: -DDEBUG" + append-cflags -DDEBUG + fi } src_install() { - emake install DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)/engines" + emake install \ + DESTDIR="${ED}" LIBDIR="/usr/$(get_libdir)/engines" dodoc README } -- cgit v1.2.3