hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [13/13] incubator-hawq git commit: HAWQ-1007. Add the pgcrypto code into hawq
Date Wed, 07 Sep 2016 02:57:51 GMT
HAWQ-1007. Add the pgcrypto code into hawq


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/801100ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/801100ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/801100ed

Branch: refs/heads/master
Commit: 801100edd78cb55ac82b9989ef7b94ae86ae89d4
Parents: 3278633
Author: Paul Guo <paulguo@gmail.com>
Authored: Tue Aug 16 14:55:39 2016 +0800
Committer: Paul Guo <paulguo@gmail.com>
Committed: Wed Sep 7 09:23:42 2016 +0800

----------------------------------------------------------------------
 contrib/.gitignore                              |    1 -
 contrib/Makefile                                |   24 +-
 contrib/pgcrypto                                |    1 -
 contrib/pgcrypto.patch                          |  287 --
 contrib/pgcrypto/.gitignore                     |    5 +
 contrib/pgcrypto/Makefile                       |   66 +
 contrib/pgcrypto/blf.c                          |  499 +++
 contrib/pgcrypto/blf.h                          |   46 +
 contrib/pgcrypto/crypt-blowfish.c               |  735 ++++
 contrib/pgcrypto/crypt-des.c                    |  774 ++++
 contrib/pgcrypto/crypt-gensalt.c                |  187 +
 contrib/pgcrypto/crypt-md5.c                    |  163 +
 contrib/pgcrypto/expected/3des.out              |   71 +
 contrib/pgcrypto/expected/blowfish.out          |  175 +
 contrib/pgcrypto/expected/cast5.out             |   88 +
 contrib/pgcrypto/expected/crypt-blowfish.out    |   27 +
 contrib/pgcrypto/expected/crypt-des.out         |   27 +
 contrib/pgcrypto/expected/crypt-md5.out         |   27 +
 contrib/pgcrypto/expected/crypt-xdes.out        |   27 +
 contrib/pgcrypto/expected/des.out               |   63 +
 contrib/pgcrypto/expected/hmac-md5.out          |   72 +
 contrib/pgcrypto/expected/hmac-sha1.out         |   72 +
 contrib/pgcrypto/expected/init.out              |   28 +
 contrib/pgcrypto/expected/md5.out               |   45 +
 contrib/pgcrypto/expected/pgp-armor.out         |  104 +
 contrib/pgcrypto/expected/pgp-compression.out   |   50 +
 contrib/pgcrypto/expected/pgp-decrypt.out       |  366 ++
 .../pgcrypto/expected/pgp-encrypt-DISABLED.out  |    1 +
 contrib/pgcrypto/expected/pgp-encrypt.out       |  191 +
 contrib/pgcrypto/expected/pgp-info.out          |   78 +
 .../pgcrypto/expected/pgp-pubkey-DISABLED.out   |    1 +
 .../pgcrypto/expected/pgp-pubkey-decrypt.out    |  555 +++
 .../pgcrypto/expected/pgp-pubkey-encrypt.out    |   70 +
 contrib/pgcrypto/expected/pgp-zlib-DISABLED.out |    1 +
 contrib/pgcrypto/expected/rijndael.out          |  126 +
 contrib/pgcrypto/expected/sha1.out              |   45 +
 contrib/pgcrypto/expected/sha2.out              |  139 +
 contrib/pgcrypto/fortuna.c                      |  462 +++
 contrib/pgcrypto/fortuna.h                      |   38 +
 contrib/pgcrypto/imath.c                        | 3681 ++++++++++++++++++
 contrib/pgcrypto/imath.h                        |  217 ++
 contrib/pgcrypto/internal-sha2.c                |  316 ++
 contrib/pgcrypto/internal.c                     |  688 ++++
 contrib/pgcrypto/mbuf.c                         |  563 +++
 contrib/pgcrypto/mbuf.h                         |  124 +
 contrib/pgcrypto/md5.c                          |  397 ++
 contrib/pgcrypto/md5.h                          |   79 +
 contrib/pgcrypto/openssl.c                      | 1032 +++++
 contrib/pgcrypto/pgcrypto--1.0.sql              |  202 +
 contrib/pgcrypto/pgcrypto--unpackaged--1.0.sql  |   38 +
 contrib/pgcrypto/pgcrypto.c                     |  469 +++
 contrib/pgcrypto/pgcrypto.control               |    5 +
 contrib/pgcrypto/pgcrypto.h                     |   49 +
 contrib/pgcrypto/pgcrypto.sql.in                |  203 +
 contrib/pgcrypto/pgp-armor.c                    |  383 ++
 contrib/pgcrypto/pgp-cfb.c                      |  265 ++
 contrib/pgcrypto/pgp-compress.c                 |  329 ++
 contrib/pgcrypto/pgp-decrypt.c                  | 1188 ++++++
 contrib/pgcrypto/pgp-encrypt.c                  |  708 ++++
 contrib/pgcrypto/pgp-info.c                     |  235 ++
 contrib/pgcrypto/pgp-mpi-internal.c             |  308 ++
 contrib/pgcrypto/pgp-mpi-openssl.c              |  285 ++
 contrib/pgcrypto/pgp-mpi.c                      |  143 +
 contrib/pgcrypto/pgp-pgsql.c                    |  919 +++++
 contrib/pgcrypto/pgp-pubdec.c                   |  236 ++
 contrib/pgcrypto/pgp-pubenc.c                   |  250 ++
 contrib/pgcrypto/pgp-pubkey.c                   |  584 +++
 contrib/pgcrypto/pgp-s2k.c                      |  296 ++
 contrib/pgcrypto/pgp.c                          |  360 ++
 contrib/pgcrypto/pgp.h                          |  314 ++
 contrib/pgcrypto/px-crypt.c                     |  167 +
 contrib/pgcrypto/px-crypt.h                     |   82 +
 contrib/pgcrypto/px-hmac.c                      |  177 +
 contrib/pgcrypto/px.c                           |  437 +++
 contrib/pgcrypto/px.h                           |  250 ++
 contrib/pgcrypto/random.c                       |  244 ++
 contrib/pgcrypto/rijndael.c                     |  677 ++++
 contrib/pgcrypto/rijndael.h                     |   60 +
 contrib/pgcrypto/rijndael.tbl                   | 1138 ++++++
 contrib/pgcrypto/sha1.c                         |  341 ++
 contrib/pgcrypto/sha1.h                         |   75 +
 contrib/pgcrypto/sha2.c                         |  991 +++++
 contrib/pgcrypto/sha2.h                         |  100 +
 contrib/pgcrypto/sql/3des.sql                   |   31 +
 contrib/pgcrypto/sql/blowfish.sql               |   92 +
 contrib/pgcrypto/sql/cast5.sql                  |   47 +
 contrib/pgcrypto/sql/crypt-blowfish.sql         |   17 +
 contrib/pgcrypto/sql/crypt-des.sql              |   17 +
 contrib/pgcrypto/sql/crypt-md5.sql              |   17 +
 contrib/pgcrypto/sql/crypt-xdes.sql             |   17 +
 contrib/pgcrypto/sql/des.sql                    |   29 +
 contrib/pgcrypto/sql/hmac-md5.sql               |   44 +
 contrib/pgcrypto/sql/hmac-sha1.sql              |   44 +
 contrib/pgcrypto/sql/init.sql                   |   18 +
 contrib/pgcrypto/sql/md5.sql                    |   11 +
 contrib/pgcrypto/sql/pgp-armor.sql              |   58 +
 contrib/pgcrypto/sql/pgp-compression.sql        |   30 +
 contrib/pgcrypto/sql/pgp-decrypt.sql            |  266 ++
 contrib/pgcrypto/sql/pgp-encrypt-DISABLED.sql   |    1 +
 contrib/pgcrypto/sql/pgp-encrypt.sql            |   97 +
 contrib/pgcrypto/sql/pgp-info.sql               |   22 +
 contrib/pgcrypto/sql/pgp-pubkey-DISABLED.sql    |    1 +
 contrib/pgcrypto/sql/pgp-pubkey-decrypt.sql     |  548 +++
 contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql     |   50 +
 contrib/pgcrypto/sql/pgp-zlib-DISABLED.sql      |    1 +
 contrib/pgcrypto/sql/rijndael.sql               |   63 +
 contrib/pgcrypto/sql/sha1.sql                   |   11 +
 contrib/pgcrypto/sql/sha2.sql                   |   33 +
 contrib/pgcrypto/uninstall_pgcrypto.sql         |   46 +
 depends/thirdparty/.gitignore                   |    1 -
 depends/thirdparty/README                       |    5 +-
 depends/thirdparty/postgres.commit              |    1 -
 112 files changed, 26643 insertions(+), 317 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/801100ed/contrib/.gitignore
----------------------------------------------------------------------
diff --git a/contrib/.gitignore b/contrib/.gitignore
deleted file mode 100644
index 2971e1e..0000000
--- a/contrib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pgcrypto_prepare_timestamp

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/801100ed/contrib/Makefile
----------------------------------------------------------------------
diff --git a/contrib/Makefile b/contrib/Makefile
index 1da02f6..a75d930 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -13,35 +13,13 @@ WANTED_DIRS = \
 
 ifeq ($(with_pgcrypto), yes)
 WANTED_DIRS += pgcrypto
-
-pgcrypto_commit := $(shell cat $(abs_top_srcdir)/depends/thirdparty/postgres.commit)
-
-pgcrypto_prepare_timestamp: pgcrypto.patch $(abs_top_srcdir)/depends/thirdparty/postgres.commit
-	rm -f pgcrypto_prepare_timestamp
-
-# This includes an ugly hack which remove two added files after "git-reset".
-# I do this because "git apply" fails if the two files have existed.
-pgcrypto_prepare: pgcrypto_prepare_timestamp
-	if [ ! -f $(abs_top_builddir)/$(subdir)/pgcrypto_prepare_timestamp ]; then \
-		[ "x$(pgcrypto_commit)" != "x" ] || exit 1; \
-		cd $(abs_top_srcdir)/depends/thirdparty; mkdir -p postgres; cd postgres; \
-		[ ! -d .git ] && git clone https://github.com/postgres/postgres.git .; \
-		git reset --hard $(pgcrypto_commit) || (echo Now fetch from upstream and try again; git
fetch origin master; git reset --hard $(pgcrypto_commit)) || exit 2; \
-		rm -f contrib/pgcrypto/pgcrypto.sql.in contrib/pgcrypto/uninstall_pgcrypto.sql; \
-		git apply $(abs_top_srcdir)/$(subdir)/pgcrypto.patch || exit 3; \
-		touch $(abs_top_builddir)/$(subdir)/pgcrypto_prepare_timestamp; \
-	fi
-else
-pgcrypto_prepare:
 endif
 
-.PHONY: pgcrypto_prepare
-
 # Missing:
 #		start-scripts	\ (does not have a makefile)
 #		xml2		\ (requires libxml installed)
 
-all install installdirs uninstall distprep: pgcrypto_prepare
+all install installdirs uninstall distprep:
 	@for dir in $(WANTED_DIRS); do \
 		$(MAKE) -C $$dir $@ || exit; \
 	done


Mime
View raw message