Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
Postgres FD Implementation
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Abuhujair Javed
Postgres FD Implementation
Commits
c19aa704
Commit
c19aa704
authored
Jul 05, 2005
by
Tom Lane
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix contrib/pgcrypto to autoconfigure for OpenSSL when --with-openssl
is used in the toplevel configure. Per Marko Kreen.
parent
d22a3727
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
57 deletions
+34
-57
configure
configure
+3
-1
configure.in
configure.in
+2
-1
contrib/pgcrypto/Makefile
contrib/pgcrypto/Makefile
+26
-54
src/Makefile.global.in
src/Makefile.global.in
+3
-1
No files found.
configure
View file @
c19aa704
...
@@ -314,7 +314,7 @@ ac_includes_default="\
...
@@ -314,7 +314,7 @@ ac_includes_default="\
# include <unistd.h>
# include <unistd.h>
#endif"
#endif"
ac_subst_vars
=
'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC CC_FOR_BUILD TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_bonjour with_openssl EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB LORDER TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
ac_subst_vars
=
'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS configure_args build build_cpu build_vendor build_os host host_cpu host_vendor host_os PORTNAME docdir enable_nls WANTED_LANGUAGES default_port enable_shared enable_rpath enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP GCC CC_FOR_BUILD TAS autodepend INCLUDES enable_thread_safety with_tcl with_perl with_python with_krb5 krb_srvtab with_pam with_bonjour with_openssl
with_zlib
EGREP ELF_SYS LDFLAGS_SL AWK FLEX FLEXFLAGS LN_S LD with_gnu_ld ld_R_works RANLIB ac_ct_RANLIB LORDER TAR STRIP ac_ct_STRIP STRIP_STATIC_LIB STRIP_SHARED_LIB YACC YFLAGS PERL perl_archlibexp perl_privlibexp perl_useshrplib perl_embed_ldflags PYTHON python_version python_configdir python_includespec python_libdir python_libspec python_additional_libs HAVE_IPV6 LIBOBJS acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS HAVE_POSIX_SIGNALS MSGFMT MSGMERGE XGETTEXT localedir TCLSH TCL_CONFIG_SH TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIBS TCL_LIB_SPEC TCL_SHARED_BUILD TCL_SHLIB_LD_LIBS NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL vpath_build LTLIBOBJS'
ac_subst_files
=
''
ac_subst_files
=
''
# Initialize some variables set by options.
# Initialize some variables set by options.
...
@@ -3906,6 +3906,7 @@ else
...
@@ -3906,6 +3906,7 @@ else
fi
;
fi
;
#
#
# Elf
# Elf
#
#
...
@@ -22916,6 +22917,7 @@ s,@krb_srvtab@,$krb_srvtab,;t t
...
@@ -22916,6 +22917,7 @@ s,@krb_srvtab@,$krb_srvtab,;t t
s,@with_pam@,
$with_pam
,;t t
s,@with_pam@,
$with_pam
,;t t
s,@with_bonjour@,
$with_bonjour
,;t t
s,@with_bonjour@,
$with_bonjour
,;t t
s,@with_openssl@,
$with_openssl
,;t t
s,@with_openssl@,
$with_openssl
,;t t
s,@with_zlib@,
$with_zlib
,;t t
s,@EGREP@,
$EGREP
,;t t
s,@EGREP@,
$EGREP
,;t t
s,@ELF_SYS@,
$ELF_SYS
,;t t
s,@ELF_SYS@,
$ELF_SYS
,;t t
s,@LDFLAGS_SL@,
$LDFLAGS_SL
,;t t
s,@LDFLAGS_SL@,
$LDFLAGS_SL
,;t t
...
...
configure.in
View file @
c19aa704
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.41
5 2005/07/03 18:54:26 petere
Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.41
6 2005/07/05 23:13:57 tgl
Exp $
dnl
dnl
dnl Developers, please strive to achieve this order:
dnl Developers, please strive to achieve this order:
dnl
dnl
...
@@ -500,6 +500,7 @@ fi
...
@@ -500,6 +500,7 @@ fi
#
#
PGAC_ARG_BOOL(with, zlib, yes,
PGAC_ARG_BOOL(with, zlib, yes,
[ --without-zlib do not use Zlib])
[ --without-zlib do not use Zlib])
AC_SUBST(with_zlib)
#
#
# Elf
# Elf
...
...
contrib/pgcrypto/Makefile
View file @
c19aa704
#
#
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.1
4 2005/03/21 05:24:51 neilc
Exp $
# $PostgreSQL: pgsql/contrib/pgcrypto/Makefile,v 1.1
5 2005/07/05 23:13:57 tgl
Exp $
#
#
# either 'builtin', 'openssl'
# if you don't have OpenSSL, you can use libc random() or /dev/urandom
cryptolib
=
builtin
INT_CFLAGS
=
-DRAND_SILLY
#INT_CFLAGS = -DRAND_DEV=\"/dev/urandom\"
# either 'builtin', 'system'
INT_SRCS
=
md5.c sha1.c internal.c blf.c rijndael.c
cryptsrc
=
builtin
# Random source, preferred order:
OSSL_CFLAGS
=
-DRAND_OPENSSL
# 'dev' - read from random device
OSSL_SRCS
=
openssl.c
#
OSSL_TESTS
=
des 3des cast5
# 'openssl' - use openssl PRNG.
# Note that currently pgcrypto does not do any
# entropy feeding to it
# This works ofcouse only with cryptolib = openssl
#
# 'silly' - use libc random() - very weak
random
=
silly
random_dev
=
\"
/dev/urandom
\"
##########################
CF_SRCS
=
$(
if
$(
subst
no,,
$(with_openssl)
)
,
$(OSSL_SRCS)
,
$(INT_SRCS)
)
CF_TESTS
=
$(
if
$(
subst
no,,
$(with_openssl)
)
,
$(OSSL_TESTS)
)
ifeq
($(cryptolib), builtin)
CF_CFLAGS
=
$(
if
$(
subst
no,,
$(with_openssl)
)
,
$(OSSL_CFLAGS)
,
$(INT_CFLAGS)
)
CRYPTO_CFLAGS
=
CRYPTO_LDFLAGS
=
SRCS
=
md5.c sha1.c internal.c blf.c rijndael.c
EXTRA_TESTS
=
endif
ifeq
($(cryptolib), openssl)
PG_CPPFLAGS
:=
$(CF_CFLAGS)
-I
$(srcdir)
$(PG_CPPFLAGS)
CRYPTO_CFLAGS
=
-I
/usr/include/openssl
CRYPTO_LDFLAGS
=
-lcrypto
SRCS
=
openssl.c
EXTRA_TESTS
=
des 3des cast5
endif
ifeq
($(cryptsrc), builtin)
SRCS
=
pgcrypto.c px.c px-hmac.c px-crypt.c misc.c random.c
\
SRCS
+=
crypt-blowfish.c crypt-des.c crypt-md5.c
crypt-gensalt.c crypt-blowfish.c crypt-des.c
\
else
crypt-md5.c
$(CF_SRCS)
CRYPTO_CFLAGS
+=
-DPX_SYSTEM_CRYPT
endif
ifeq
($(random), dev)
CRYPTO_CFLAGS
+=
-DRAND_DEV
=
$(random_dev)
endif
ifeq
($(random), openssl)
CRYPTO_CFLAGS
+=
-DRAND_OPENSSL
endif
ifeq
($(random), silly)
CRYPTO_CFLAGS
+=
-DRAND_SILLY
endif
SRCS
+=
pgcrypto.c px.c px-hmac.c px-crypt.c misc.c
\
crypt-gensalt.c random.c
MODULE_big
=
pgcrypto
MODULE_big
=
pgcrypto
OBJS
=
$(SRCS:.c=.o)
OBJS
=
$(SRCS:.c=.o)
...
@@ -61,12 +28,9 @@ DOCS = README.pgcrypto
...
@@ -61,12 +28,9 @@ DOCS = README.pgcrypto
DATA_built
=
pgcrypto.sql
DATA_built
=
pgcrypto.sql
EXTRA_CLEAN
=
gen-rtab
EXTRA_CLEAN
=
gen-rtab
PG_CPPFLAGS
=
$(CRYPTO_CFLAGS)
-I
$(srcdir)
SHLIB_LINK
=
$(CRYPTO_LDFLAGS)
REGRESS
=
init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael
\
REGRESS
=
init md5 sha1 hmac-md5 hmac-sha1 blowfish rijndael
\
$(EXTRA
_TESTS)
\
$(CF
_TESTS)
\
crypt-des crypt-md5 crypt-blowfish crypt-xdes
crypt-des crypt-md5 crypt-blowfish crypt-xdes
ifdef
USE_PGXS
ifdef
USE_PGXS
...
@@ -79,6 +43,14 @@ include $(top_builddir)/src/Makefile.global
...
@@ -79,6 +43,14 @@ include $(top_builddir)/src/Makefile.global
include
$(top_srcdir)/contrib/contrib-global.mk
include
$(top_srcdir)/contrib/contrib-global.mk
endif
endif
# Add libraries that pgcrypto depends (or might depend) on into the
# shared library link. (The order in which you list them here doesn't
# matter.)
SHLIB_LINK
+=
$(
filter
-lcrypt
-ldes
-lcrypto
-lssl
,
$(LIBS)
)
ifeq
($(PORTNAME), win32)
SHLIB_LINK
+=
$(
filter
-leay32
-lssleay32
,
$(LIBS)
)
endif
# to make ws2_32.lib the last library (must occur after definition of PORTNAME)
# to make ws2_32.lib the last library (must occur after definition of PORTNAME)
ifeq
($(PORTNAME),win32)
ifeq
($(PORTNAME),win32)
SHLIB_LINK
+=
-lwsock32
-lws2_32
SHLIB_LINK
+=
-lwsock32
-lws2_32
...
@@ -87,6 +59,6 @@ endif
...
@@ -87,6 +59,6 @@ endif
rijndael.o
:
rijndael.tbl
rijndael.o
:
rijndael.tbl
rijndael.tbl
:
rijndael.tbl
:
rijndael.c
$(CC)
$(CPPFLAGS)
$(CFLAGS)
-DPRINT_TABS
rijndael.c
-o
gen-rtab
$(CC)
$(CPPFLAGS)
$(CFLAGS)
-DPRINT_TABS
rijndael.c
-o
gen-rtab
./gen-rtab
>
rijndael.tbl
./gen-rtab
>
rijndael.tbl
src/Makefile.global.in
View file @
c19aa704
# -*-makefile-*-
# -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.21
5 2005/07/03 18:54:28 petere
Exp $
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.21
6 2005/07/05 23:13:57 tgl
Exp $
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
# All PostgreSQL makefiles include this file and use the variables it sets,
...
@@ -128,6 +128,8 @@ pgxsdir = $(pkglibdir)/pgxs
...
@@ -128,6 +128,8 @@ pgxsdir = $(pkglibdir)/pgxs
with_perl
=
@with_perl@
with_perl
=
@with_perl@
with_python
=
@with_python@
with_python
=
@with_python@
with_tcl
=
@with_tcl@
with_tcl
=
@with_tcl@
with_openssl
=
@with_openssl@
with_zlib
=
@with_zlib@
enable_shared
=
@enable_shared@
enable_shared
=
@enable_shared@
enable_rpath
=
@enable_rpath@
enable_rpath
=
@enable_rpath@
enable_nls
=
@enable_nls@
enable_nls
=
@enable_nls@
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment