diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-09-24 12:33:44 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-09-24 12:33:44 +0000 |
commit | 5a38b66562c0bc3da766e90ecba371f03620c9aa (patch) | |
tree | 465159c3c8e54d21701b082643b0f930a0101cda /security | |
parent | be95b817b08a7ca5b22216e206068ec91aca5a95 (diff) | |
download | pkgsrc-5a38b66562c0bc3da766e90ecba371f03620c9aa.tar.gz |
Fix broken patch files.
Diffstat (limited to 'security')
-rw-r--r-- | security/HElib/distinfo | 6 | ||||
-rw-r--r-- | security/HElib/patches/patch-Makefile | 82 | ||||
-rw-r--r-- | security/HElib/patches/patch-NumbTh.h | 42 |
3 files changed, 65 insertions, 65 deletions
diff --git a/security/HElib/distinfo b/security/HElib/distinfo index 449dcddc84a..abb001c5ec0 100644 --- a/security/HElib/distinfo +++ b/security/HElib/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2013/05/21 16:37:46 joerg Exp $ +$NetBSD: distinfo,v 1.3 2014/09/24 12:39:28 jperkin Exp $ SHA1 (HElib-20130501.zip) = 4f10c723eda202442550b89d98da8b9f4fdca013 RMD160 (HElib-20130501.zip) = 729115076c6e90584cf5380694903631764849fb Size (HElib-20130501.zip) = 2287320 bytes SHA1 (patch-IndexMap.h) = f03a5c5d64370a233bf73fd3bff369e32f8a220a -SHA1 (patch-Makefile) = e3a867712039b83f2c49c4dec2e5ff0a6c26f6ac -SHA1 (patch-NumbTh.h) = f99493989f67d34595bc4e47b159dc75a952b158 +SHA1 (patch-Makefile) = 0b42ca325a589609a219ec6fd1f15547075e231d +SHA1 (patch-NumbTh.h) = 30ed52fafe98c461eb76252c81bab9c7d4a1b715 SHA1 (patch-timing.cpp) = 87e2638022326ef9bcb28c8617aa3d8d34c3aa85 diff --git a/security/HElib/patches/patch-Makefile b/security/HElib/patches/patch-Makefile index a47a18a9045..e27ff37fbe4 100644 --- a/security/HElib/patches/patch-Makefile +++ b/security/HElib/patches/patch-Makefile @@ -1,46 +1,46 @@ -$NetBSD: patch-Makefile,v 1.1.1.1 2013/05/18 18:36:25 agc Exp $ +$NetBSD: patch-Makefile,v 1.2 2014/09/24 12:39:28 jperkin Exp $ adapt for pkgsrc add an install target ---- Makefile.orig 2013-04-30 14:31:26.000000000 -0700 -+++ Makefile 2013-05-07 11:20:59.000000000 -0700 +--- Makefile.orig 2013-04-30 21:31:26.000000000 +0000 ++++ Makefile @@ -16,7 +16,7 @@ - CC = g++ - #CFLAGS = -g -Wall -O3 -I/usr/local/include - #CFLAGS = -g -Wall -I/usr/local/include --CFLAGS = -g -O2 -Wfatal-errors -Wshadow -Wall -I/usr/local/include -+CFLAGS = -g -Wall -O2 -I${PREFIX}/include - #CFLAGS = -pg -Wall -I/usr/local/include - LD = g++ - -@@ -41,12 +41,12 @@ - all: fhe.a - - check: Test_General_x -- Test_General_x R=1 k=10 p=2 r=1 d=1 -- Test_General_x R=1 k=10 p=2 r=2 d=1 -- Test_General_x R=1 k=10 p=2 r=1 d=2 -- Test_General_x R=1 k=10 p=3 r=1 d=1 -- Test_General_x R=1 k=10 p=3 r=2 d=1 -- Test_General_x R=1 k=10 p=3 r=1 d=2 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=2 r=1 d=1 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=2 r=2 d=1 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=2 r=1 d=2 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=3 r=1 d=1 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=3 r=2 d=1 -+ env LD_LIBRARY_PATH=${PREFIX}/lib ./Test_General_x R=1 k=10 p=3 r=1 d=2 - - test: $(TESTPROGS) - -@@ -64,3 +64,10 @@ - clean: - rm -f *.o *_x *_x.exe *.a core.* - rm -rf *.dSYM -+ -+install: -+ ${BSD_INSTALL_LIB} fhe.a ${DESTDIR}${PREFIX}/lib/libfhe.a -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/FHE -+ for h in ${HEADER}; do \ -+ ${BSD_INSTALL_DATA} $$h ${DESTDIR}${PREFIX}/FHE/$$h; \ -+ done + CC = g++
+ #CFLAGS = -g -Wall -O3 -I/usr/local/include
+ #CFLAGS = -g -Wall -I/usr/local/include
+-CFLAGS = -g -O2 -Wfatal-errors -Wshadow -Wall -I/usr/local/include
++CFLAGS = -g -Wall -O2 -I${PREFIX}/include
+ #CFLAGS = -pg -Wall -I/usr/local/include
+ LD = g++
+
+@@ -41,12 +41,12 @@ TESTPROGS = Test_General_x Test_Replicat + all: fhe.a
+
+ check: Test_General_x
+- Test_General_x R=1 k=10 p=2 r=1 d=1
+- Test_General_x R=1 k=10 p=2 r=2 d=1
+- Test_General_x R=1 k=10 p=2 r=1 d=2
+- Test_General_x R=1 k=10 p=3 r=1 d=1
+- Test_General_x R=1 k=10 p=3 r=2 d=1
+- Test_General_x R=1 k=10 p=3 r=1 d=2
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=2 r=1 d=1
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=2 r=2 d=1
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=2 r=1 d=2
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=3 r=1 d=1
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=3 r=2 d=1
++ env LD_LIBRARY_PATH=${PREFIX}/lib Test_General_x R=1 k=10 p=3 r=1 d=2
+
+ test: $(TESTPROGS)
+
+@@ -64,3 +64,10 @@ fhe.a: $(OBJ) + clean:
+ rm -f *.o *_x *_x.exe *.a core.*
+ rm -rf *.dSYM
++
++install:
++ ${BSD_INSTALL_LIB} fhe.a ${DESTDIR}${PREFIX}/lib/libfhe.a
++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/FHE
++ for h in ${HEADER}; do \
++ ${BSD_INSTALL_DATA} $$h ${DESTDIR}${PREFIX}/FHE/$$h; \
++ done
diff --git a/security/HElib/patches/patch-NumbTh.h b/security/HElib/patches/patch-NumbTh.h index 37dca104b57..52884a12b90 100644 --- a/security/HElib/patches/patch-NumbTh.h +++ b/security/HElib/patches/patch-NumbTh.h @@ -1,24 +1,24 @@ -$NetBSD: patch-NumbTh.h,v 1.1 2013/05/21 16:37:46 joerg Exp $ +$NetBSD: patch-NumbTh.h,v 1.2 2014/09/24 12:39:28 jperkin Exp $ ---- NumbTh.h.orig 2013-05-21 14:43:10.000000000 +0000 +--- NumbTh.h.orig 2013-04-30 21:31:26.000000000 +0000 +++ NumbTh.h @@ -32,13 +32,18 @@ - #include <NTL/mat_GF2E.h> - #include <NTL/lzz_pXFactoring.h> - #include <NTL/GF2XFactoring.h> -+#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION) -+#include <unordered_map> -+#else - #include <tr1/unordered_map> -+using std::tr1::unordered_map; -+#endif - #include <string> - NTL_CLIENT - - - //! @typedef --typedef tr1::unordered_map<string, const char *> argmap_t; -+typedef unordered_map<string, const char *> argmap_t; - - - //! @brief Code for parsing command line arguments. + #include <NTL/mat_GF2E.h>
+ #include <NTL/lzz_pXFactoring.h>
+ #include <NTL/GF2XFactoring.h>
++#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
++#include <unordered_map>
++#else
+ #include <tr1/unordered_map>
++using std::tr1::unordered_map;
++#endif
+ #include <string>
+ NTL_CLIENT
+
+
+ //! @typedef
+-typedef tr1::unordered_map<string, const char *> argmap_t;
++typedef unordered_map<string, const char *> argmap_t;
+
+
+ //! @brief Code for parsing command line arguments.
|