Imported Debian patch 4.7.2-3
This commit is contained in:
Timo Aaltonen
committed by
Mario Fetka
Mario Fetka
parent
27edeba051
commit
8bc559c5a1
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# contrib/Makefile. Generated from Makefile.in by configure.
|
||||
|
||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -187,23 +187,23 @@ am__relativize = \
|
||||
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
||||
done; \
|
||||
reldir="$$dir2"
|
||||
ACLOCAL = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing aclocal-1.16
|
||||
ACLOCAL = ${SHELL} /home/abokovoy/src/freeipa/missing aclocal-1.16
|
||||
AMTAR = $${TAR-tar}
|
||||
AM_DEFAULT_VERBOSITY = 1
|
||||
API_VERSION = 2.239
|
||||
API_VERSION = 2.230
|
||||
AR = ar
|
||||
AUTOCONF = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing automake-1.16
|
||||
AUTOCONF = ${SHELL} /home/abokovoy/src/freeipa/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/abokovoy/src/freeipa/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/abokovoy/src/freeipa/missing automake-1.16
|
||||
AWK = gawk
|
||||
CC = gcc
|
||||
CCDEPMODE = depmode=gcc3
|
||||
CFLAGS = -D__STDC_WANT_LIB_EXT1__=1 -D_DEFAULT_SOURCE=1 -D_POSIX_C_SOURCE=200809L -Werror=implicit-function-declaration
|
||||
CFLAGS = -g -O2 -Werror=implicit-function-declaration
|
||||
CMOCKA_CFLAGS =
|
||||
CMOCKA_LIBS = -lcmocka
|
||||
CONFIG_STATUS = ./config.status
|
||||
CPP = gcc -E
|
||||
CPPFLAGS =
|
||||
CPPFLAGS = -I/usr/include/nspr4 -I/usr/include/nss3 -I/usr/include/nspr4
|
||||
CRYPTO_CFLAGS =
|
||||
CRYPTO_LIBS = -lcrypto
|
||||
CYGPATH_W = echo
|
||||
@@ -223,7 +223,7 @@ EXEEXT =
|
||||
FGREP = /usr/bin/grep -F
|
||||
GETTEXT_DOMAIN = ipa
|
||||
GETTEXT_MACRO_VERSION = 0.18
|
||||
GIT_BRANCH = ipa-4-8
|
||||
GIT_BRANCH = ipa-4-7
|
||||
GIT_VERSION =
|
||||
GMSGFMT = /usr/bin/msgfmt
|
||||
GMSGFMT_015 = /usr/bin/msgfmt
|
||||
@@ -244,8 +244,6 @@ JSLINT = /usr/bin/jsl
|
||||
KRAD_LIBS = -lkrad
|
||||
KRB5KDC_SERVICE = krb5kdc.service
|
||||
KRB5_CFLAGS =
|
||||
KRB5_GSSAPI_CFLAGS =
|
||||
KRB5_GSSAPI_LIBS = -lgssapi_krb5
|
||||
KRB5_LIBS = -lkrb5 -lk5crypto -lcom_err
|
||||
LD = /usr/bin/ld -m elf_x86_64
|
||||
LDAP_CFLAGS =
|
||||
@@ -266,7 +264,7 @@ LTLIBICONV = -liconv
|
||||
LTLIBINTL =
|
||||
LTLIBOBJS =
|
||||
LT_SYS_LIBRARY_PATH =
|
||||
MAKEINFO = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing makeinfo
|
||||
MAKEINFO = ${SHELL} /home/abokovoy/src/freeipa/missing makeinfo
|
||||
MANIFEST_TOOL = :
|
||||
MKDIR_P = /usr/bin/mkdir -p
|
||||
MK_ASSIGN = =
|
||||
@@ -288,20 +286,21 @@ NM = /usr/bin/nm -B
|
||||
NMEDIT =
|
||||
NSPR_CFLAGS = -I/usr/include/nspr4
|
||||
NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl
|
||||
NUM_VERSION = 40810
|
||||
NSS_CFLAGS = -I/usr/include/nss3 -I/usr/include/nspr4
|
||||
NSS_LIBS = -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
|
||||
NUM_VERSION = 40702
|
||||
OBJDUMP = objdump
|
||||
OBJEXT = o
|
||||
ODS_GROUP = ods
|
||||
ODS_USER = ods
|
||||
OTOOL =
|
||||
OTOOL64 =
|
||||
PACKAGE = freeipa
|
||||
PACKAGE_BUGREPORT = https://hosted.fedoraproject.org/projects/freeipa/newticket
|
||||
PACKAGE_NAME = freeipa
|
||||
PACKAGE_STRING = freeipa 4.8.10
|
||||
PACKAGE_STRING = freeipa 4.7.2
|
||||
PACKAGE_TARNAME = freeipa
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 4.8.10
|
||||
PACKAGE_VERSION = 4.7.2
|
||||
PATH_SEPARATOR = :
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
PKG_CONFIG_LIBDIR =
|
||||
@@ -311,12 +310,14 @@ POPT_CFLAGS =
|
||||
POPT_LIBS = -lpopt
|
||||
POSUB = po
|
||||
PYLINT = yes
|
||||
PYTHON = /usr/bin/python
|
||||
PYTHON = /usr/bin/python3
|
||||
PYTHON2 = /usr/bin/python2
|
||||
PYTHON3 = /usr/bin/python3
|
||||
PYTHON_EXEC_PREFIX = ${exec_prefix}
|
||||
PYTHON_INSTALL_EXTRA_OPTIONS =
|
||||
PYTHON_PLATFORM = linux
|
||||
PYTHON_PREFIX = ${prefix}
|
||||
PYTHON_VERSION = 3.9
|
||||
PYTHON_VERSION = 3.7
|
||||
RANLIB = ranlib
|
||||
SAMBA40EXTRA_LIBPATH = -L/usr/lib64/samba -Wl,-rpath=/usr/lib64/samba
|
||||
SAMBAUTIL_CFLAGS = -I/usr/include/samba-4.0 -DHAVE_IMMEDIATE_STRUCTURES=1
|
||||
@@ -343,16 +344,16 @@ USE_NLS = yes
|
||||
UUID_CFLAGS = -I/usr/include/uuid
|
||||
UUID_LIBS = -luuid
|
||||
VENDOR_SUFFIX =
|
||||
VERSION = 4.8.10
|
||||
VERSION = 4.7.2
|
||||
XGETTEXT = /usr/bin/xgettext
|
||||
XGETTEXT_015 = /usr/bin/xgettext
|
||||
XGETTEXT_EXTRA_OPTIONS =
|
||||
XMLRPC_CFLAGS =
|
||||
XMLRPC_LIBS = -lxmlrpc -lxmlrpc_client -lxmlrpc_util
|
||||
abs_builddir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10/contrib
|
||||
abs_srcdir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10/contrib
|
||||
abs_top_builddir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10
|
||||
abs_top_srcdir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10
|
||||
abs_builddir = /home/abokovoy/src/freeipa/contrib
|
||||
abs_srcdir = /home/abokovoy/src/freeipa/contrib
|
||||
abs_top_builddir = /home/abokovoy/src/freeipa
|
||||
abs_top_srcdir = /home/abokovoy/src/freeipa
|
||||
ac_ct_AR = ar
|
||||
ac_ct_CC = gcc
|
||||
ac_ct_DUMPBIN =
|
||||
@@ -382,8 +383,8 @@ htmldir = ${docdir}
|
||||
i18ntests =
|
||||
includedir = ${prefix}/include
|
||||
infodir = ${datarootdir}/info
|
||||
install_sh = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/install-sh
|
||||
krb5rundir = /run/krb5kdc
|
||||
install_sh = ${SHELL} /home/abokovoy/src/freeipa/install-sh
|
||||
krb5rundir = ${prefix}/var/run/krb5kdc
|
||||
libdir = ${exec_prefix}/lib
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
@@ -397,17 +398,15 @@ pkgpythondir = ${pythondir}/freeipa
|
||||
prefix = /usr/local
|
||||
program_transform_name = s,x,x,
|
||||
psdir = ${docdir}
|
||||
pyexecdir = ${exec_prefix}/lib64/python3.9/site-packages
|
||||
pythondir = ${prefix}/lib/python3.9/site-packages
|
||||
runstatedir = /run
|
||||
pyexecdir = ${exec_prefix}/lib64/python3.7/site-packages
|
||||
pythondir = ${prefix}/lib/python3.7/site-packages
|
||||
sbindir = ${exec_prefix}/sbin
|
||||
selinux_makefile = /usr/share/selinux/devel/Makefile
|
||||
sharedstatedir = ${prefix}/com
|
||||
srcdir = .
|
||||
sysconfdir = ${prefix}/etc
|
||||
sysconfenvdir = ${prefix}/etc/sysconfig
|
||||
systemdsystemunitdir = /usr/lib/systemd/system
|
||||
systemdtmpfilesdir = ${prefix}/lib/tmpfiles.d
|
||||
systemdtmpfilesdir = /usr/lib/tmpfiles.d
|
||||
target_alias =
|
||||
top_build_prefix = ../
|
||||
top_builddir = ..
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -244,8 +244,6 @@ JSLINT = @JSLINT@
|
||||
KRAD_LIBS = @KRAD_LIBS@
|
||||
KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
|
||||
KRB5_CFLAGS = @KRB5_CFLAGS@
|
||||
KRB5_GSSAPI_CFLAGS = @KRB5_GSSAPI_CFLAGS@
|
||||
KRB5_GSSAPI_LIBS = @KRB5_GSSAPI_LIBS@
|
||||
KRB5_LIBS = @KRB5_LIBS@
|
||||
LD = @LD@
|
||||
LDAP_CFLAGS = @LDAP_CFLAGS@
|
||||
@@ -288,10 +286,11 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NSPR_CFLAGS = @NSPR_CFLAGS@
|
||||
NSPR_LIBS = @NSPR_LIBS@
|
||||
NSS_CFLAGS = @NSS_CFLAGS@
|
||||
NSS_LIBS = @NSS_LIBS@
|
||||
NUM_VERSION = @NUM_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
ODS_GROUP = @ODS_GROUP@
|
||||
ODS_USER = @ODS_USER@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
@@ -312,6 +311,8 @@ POPT_LIBS = @POPT_LIBS@
|
||||
POSUB = @POSUB@
|
||||
PYLINT = @PYLINT@
|
||||
PYTHON = @PYTHON@
|
||||
PYTHON2 = @PYTHON2@
|
||||
PYTHON3 = @PYTHON3@
|
||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||
PYTHON_INSTALL_EXTRA_OPTIONS = @PYTHON_INSTALL_EXTRA_OPTIONS@
|
||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||
@@ -399,9 +400,7 @@ program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
selinux_makefile = @selinux_makefile@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# contrib/completion/Makefile. Generated from Makefile.in by configure.
|
||||
|
||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -157,23 +157,23 @@ am__can_run_installinfo = \
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
am__DIST_COMMON = $(srcdir)/Makefile.in
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing aclocal-1.16
|
||||
ACLOCAL = ${SHELL} /home/abokovoy/src/freeipa/missing aclocal-1.16
|
||||
AMTAR = $${TAR-tar}
|
||||
AM_DEFAULT_VERBOSITY = 1
|
||||
API_VERSION = 2.239
|
||||
API_VERSION = 2.230
|
||||
AR = ar
|
||||
AUTOCONF = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing automake-1.16
|
||||
AUTOCONF = ${SHELL} /home/abokovoy/src/freeipa/missing autoconf
|
||||
AUTOHEADER = ${SHELL} /home/abokovoy/src/freeipa/missing autoheader
|
||||
AUTOMAKE = ${SHELL} /home/abokovoy/src/freeipa/missing automake-1.16
|
||||
AWK = gawk
|
||||
CC = gcc
|
||||
CCDEPMODE = depmode=gcc3
|
||||
CFLAGS = -D__STDC_WANT_LIB_EXT1__=1 -D_DEFAULT_SOURCE=1 -D_POSIX_C_SOURCE=200809L -Werror=implicit-function-declaration
|
||||
CFLAGS = -g -O2 -Werror=implicit-function-declaration
|
||||
CMOCKA_CFLAGS =
|
||||
CMOCKA_LIBS = -lcmocka
|
||||
CONFIG_STATUS = ./config.status
|
||||
CPP = gcc -E
|
||||
CPPFLAGS =
|
||||
CPPFLAGS = -I/usr/include/nspr4 -I/usr/include/nss3 -I/usr/include/nspr4
|
||||
CRYPTO_CFLAGS =
|
||||
CRYPTO_LIBS = -lcrypto
|
||||
CYGPATH_W = echo
|
||||
@@ -193,7 +193,7 @@ EXEEXT =
|
||||
FGREP = /usr/bin/grep -F
|
||||
GETTEXT_DOMAIN = ipa
|
||||
GETTEXT_MACRO_VERSION = 0.18
|
||||
GIT_BRANCH = ipa-4-8
|
||||
GIT_BRANCH = ipa-4-7
|
||||
GIT_VERSION =
|
||||
GMSGFMT = /usr/bin/msgfmt
|
||||
GMSGFMT_015 = /usr/bin/msgfmt
|
||||
@@ -214,8 +214,6 @@ JSLINT = /usr/bin/jsl
|
||||
KRAD_LIBS = -lkrad
|
||||
KRB5KDC_SERVICE = krb5kdc.service
|
||||
KRB5_CFLAGS =
|
||||
KRB5_GSSAPI_CFLAGS =
|
||||
KRB5_GSSAPI_LIBS = -lgssapi_krb5
|
||||
KRB5_LIBS = -lkrb5 -lk5crypto -lcom_err
|
||||
LD = /usr/bin/ld -m elf_x86_64
|
||||
LDAP_CFLAGS =
|
||||
@@ -236,7 +234,7 @@ LTLIBICONV = -liconv
|
||||
LTLIBINTL =
|
||||
LTLIBOBJS =
|
||||
LT_SYS_LIBRARY_PATH =
|
||||
MAKEINFO = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/missing makeinfo
|
||||
MAKEINFO = ${SHELL} /home/abokovoy/src/freeipa/missing makeinfo
|
||||
MANIFEST_TOOL = :
|
||||
MKDIR_P = /usr/bin/mkdir -p
|
||||
MK_ASSIGN = =
|
||||
@@ -258,20 +256,21 @@ NM = /usr/bin/nm -B
|
||||
NMEDIT =
|
||||
NSPR_CFLAGS = -I/usr/include/nspr4
|
||||
NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl
|
||||
NUM_VERSION = 40810
|
||||
NSS_CFLAGS = -I/usr/include/nss3 -I/usr/include/nspr4
|
||||
NSS_LIBS = -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl
|
||||
NUM_VERSION = 40702
|
||||
OBJDUMP = objdump
|
||||
OBJEXT = o
|
||||
ODS_GROUP = ods
|
||||
ODS_USER = ods
|
||||
OTOOL =
|
||||
OTOOL64 =
|
||||
PACKAGE = freeipa
|
||||
PACKAGE_BUGREPORT = https://hosted.fedoraproject.org/projects/freeipa/newticket
|
||||
PACKAGE_NAME = freeipa
|
||||
PACKAGE_STRING = freeipa 4.8.10
|
||||
PACKAGE_STRING = freeipa 4.7.2
|
||||
PACKAGE_TARNAME = freeipa
|
||||
PACKAGE_URL =
|
||||
PACKAGE_VERSION = 4.8.10
|
||||
PACKAGE_VERSION = 4.7.2
|
||||
PATH_SEPARATOR = :
|
||||
PKG_CONFIG = /usr/bin/pkg-config
|
||||
PKG_CONFIG_LIBDIR =
|
||||
@@ -281,12 +280,14 @@ POPT_CFLAGS =
|
||||
POPT_LIBS = -lpopt
|
||||
POSUB = po
|
||||
PYLINT = yes
|
||||
PYTHON = /usr/bin/python
|
||||
PYTHON = /usr/bin/python3
|
||||
PYTHON2 = /usr/bin/python2
|
||||
PYTHON3 = /usr/bin/python3
|
||||
PYTHON_EXEC_PREFIX = ${exec_prefix}
|
||||
PYTHON_INSTALL_EXTRA_OPTIONS =
|
||||
PYTHON_PLATFORM = linux
|
||||
PYTHON_PREFIX = ${prefix}
|
||||
PYTHON_VERSION = 3.9
|
||||
PYTHON_VERSION = 3.7
|
||||
RANLIB = ranlib
|
||||
SAMBA40EXTRA_LIBPATH = -L/usr/lib64/samba -Wl,-rpath=/usr/lib64/samba
|
||||
SAMBAUTIL_CFLAGS = -I/usr/include/samba-4.0 -DHAVE_IMMEDIATE_STRUCTURES=1
|
||||
@@ -313,16 +314,16 @@ USE_NLS = yes
|
||||
UUID_CFLAGS = -I/usr/include/uuid
|
||||
UUID_LIBS = -luuid
|
||||
VENDOR_SUFFIX =
|
||||
VERSION = 4.8.10
|
||||
VERSION = 4.7.2
|
||||
XGETTEXT = /usr/bin/xgettext
|
||||
XGETTEXT_015 = /usr/bin/xgettext
|
||||
XGETTEXT_EXTRA_OPTIONS =
|
||||
XMLRPC_CFLAGS =
|
||||
XMLRPC_LIBS = -lxmlrpc -lxmlrpc_client -lxmlrpc_util
|
||||
abs_builddir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10/contrib/completion
|
||||
abs_srcdir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10/contrib/completion
|
||||
abs_top_builddir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10
|
||||
abs_top_srcdir = /home/abokovoy/src/freeipa-build/freeipa-4-8-10
|
||||
abs_builddir = /home/abokovoy/src/freeipa/contrib/completion
|
||||
abs_srcdir = /home/abokovoy/src/freeipa/contrib/completion
|
||||
abs_top_builddir = /home/abokovoy/src/freeipa
|
||||
abs_top_srcdir = /home/abokovoy/src/freeipa
|
||||
ac_ct_AR = ar
|
||||
ac_ct_CC = gcc
|
||||
ac_ct_DUMPBIN =
|
||||
@@ -352,8 +353,8 @@ htmldir = ${docdir}
|
||||
i18ntests =
|
||||
includedir = ${prefix}/include
|
||||
infodir = ${datarootdir}/info
|
||||
install_sh = ${SHELL} /home/abokovoy/src/freeipa-build/freeipa-4-8-10/install-sh
|
||||
krb5rundir = /run/krb5kdc
|
||||
install_sh = ${SHELL} /home/abokovoy/src/freeipa/install-sh
|
||||
krb5rundir = ${prefix}/var/run/krb5kdc
|
||||
libdir = ${exec_prefix}/lib
|
||||
libexecdir = ${exec_prefix}/libexec
|
||||
localedir = ${datarootdir}/locale
|
||||
@@ -367,17 +368,15 @@ pkgpythondir = ${pythondir}/freeipa
|
||||
prefix = /usr/local
|
||||
program_transform_name = s,x,x,
|
||||
psdir = ${docdir}
|
||||
pyexecdir = ${exec_prefix}/lib64/python3.9/site-packages
|
||||
pythondir = ${prefix}/lib/python3.9/site-packages
|
||||
runstatedir = /run
|
||||
pyexecdir = ${exec_prefix}/lib64/python3.7/site-packages
|
||||
pythondir = ${prefix}/lib/python3.7/site-packages
|
||||
sbindir = ${exec_prefix}/sbin
|
||||
selinux_makefile = /usr/share/selinux/devel/Makefile
|
||||
sharedstatedir = ${prefix}/com
|
||||
srcdir = .
|
||||
sysconfdir = ${prefix}/etc
|
||||
sysconfenvdir = ${prefix}/etc/sysconfig
|
||||
systemdsystemunitdir = /usr/lib/systemd/system
|
||||
systemdtmpfilesdir = ${prefix}/lib/tmpfiles.d
|
||||
systemdtmpfilesdir = /usr/lib/tmpfiles.d
|
||||
target_alias =
|
||||
top_build_prefix = ../../
|
||||
top_builddir = ../..
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Makefile.in generated by automake 1.16.2 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.16.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994-2020 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994-2018 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
@@ -214,8 +214,6 @@ JSLINT = @JSLINT@
|
||||
KRAD_LIBS = @KRAD_LIBS@
|
||||
KRB5KDC_SERVICE = @KRB5KDC_SERVICE@
|
||||
KRB5_CFLAGS = @KRB5_CFLAGS@
|
||||
KRB5_GSSAPI_CFLAGS = @KRB5_GSSAPI_CFLAGS@
|
||||
KRB5_GSSAPI_LIBS = @KRB5_GSSAPI_LIBS@
|
||||
KRB5_LIBS = @KRB5_LIBS@
|
||||
LD = @LD@
|
||||
LDAP_CFLAGS = @LDAP_CFLAGS@
|
||||
@@ -258,10 +256,11 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
NSPR_CFLAGS = @NSPR_CFLAGS@
|
||||
NSPR_LIBS = @NSPR_LIBS@
|
||||
NSS_CFLAGS = @NSS_CFLAGS@
|
||||
NSS_LIBS = @NSS_LIBS@
|
||||
NUM_VERSION = @NUM_VERSION@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
ODS_GROUP = @ODS_GROUP@
|
||||
ODS_USER = @ODS_USER@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
@@ -282,6 +281,8 @@ POPT_LIBS = @POPT_LIBS@
|
||||
POSUB = @POSUB@
|
||||
PYLINT = @PYLINT@
|
||||
PYTHON = @PYTHON@
|
||||
PYTHON2 = @PYTHON2@
|
||||
PYTHON3 = @PYTHON3@
|
||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||
PYTHON_INSTALL_EXTRA_OPTIONS = @PYTHON_INSTALL_EXTRA_OPTIONS@
|
||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||
@@ -369,9 +370,7 @@ program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
pyexecdir = @pyexecdir@
|
||||
pythondir = @pythondir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
selinux_makefile = @selinux_makefile@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@@ -31,12 +31,6 @@ from ipaserver.install.dsinstance import DS_USER
|
||||
from ipaserver.install.cainstance import PKI_USER
|
||||
from ipapython import services
|
||||
|
||||
# for mod_nss
|
||||
from ipaserver.install.httpinstance import NSS_CONF
|
||||
from ipaserver.install.httpinstance import HTTPInstance
|
||||
from ipaserver.install import installutils
|
||||
from ipapython import sysrestore
|
||||
|
||||
SERVERID = "PKI-IPA"
|
||||
SCHEMA_FILENAMES = (
|
||||
"60kerberos.ldif",
|
||||
@@ -106,77 +100,6 @@ def restart_pki_ds():
|
||||
services.service('dirsrv').restart(SERVERID)
|
||||
|
||||
|
||||
# The ipa-3-0 set_directive() has very loose comparision of directive
|
||||
# which would cause multiple NSSCipherSuite to be added so provide
|
||||
# a custom function for it.
|
||||
def set_directive(filename, directive, value, quotes=True, separator=' '):
|
||||
"""Set a name/value pair directive in a configuration file.
|
||||
|
||||
A value of None means to drop the directive.
|
||||
|
||||
This has only been tested with nss.conf
|
||||
"""
|
||||
valueset = False
|
||||
st = os.stat(filename)
|
||||
fd = open(filename)
|
||||
newfile = []
|
||||
for line in fd:
|
||||
if line.lstrip().startswith(directive):
|
||||
valueset = True
|
||||
if value is not None:
|
||||
if quotes:
|
||||
newfile.append('%s%s"%s"\n' %
|
||||
(directive, separator, value))
|
||||
else:
|
||||
newfile.append('%s%s%s\n' % (directive, separator, value))
|
||||
else:
|
||||
newfile.append(line)
|
||||
fd.close()
|
||||
if not valueset:
|
||||
if value is not None:
|
||||
if quotes:
|
||||
newfile.append('%s%s"%s"\n' % (directive, separator, value))
|
||||
else:
|
||||
newfile.append('%s%s%s\n' % (directive, separator, value))
|
||||
|
||||
fd = open(filename, "w")
|
||||
fd.write("".join(newfile))
|
||||
fd.close()
|
||||
os.chown(filename, st.st_uid, st.st_gid) # reset perms
|
||||
|
||||
|
||||
def update_mod_nss_cipher_suite():
|
||||
add_ciphers = ['ecdhe_rsa_aes_128_sha', 'ecdhe_rsa_aes_256_sha']
|
||||
ciphers = installutils.get_directive(NSS_CONF, 'NSSCipherSuite')
|
||||
|
||||
# Run through once to see if any of the new ciphers are there but
|
||||
# disabled. If they are then enable them.
|
||||
lciphers = ciphers.split(',')
|
||||
new_ciphers = []
|
||||
for cipher in lciphers:
|
||||
for add in add_ciphers:
|
||||
if cipher.endswith(add):
|
||||
if cipher.startswith('-'):
|
||||
cipher = '+%s' % add
|
||||
new_ciphers.append(cipher)
|
||||
|
||||
# Run through again and add remaining ciphers as enabled.
|
||||
for add in add_ciphers:
|
||||
if add not in ciphers:
|
||||
new_ciphers.append('+%s' % add)
|
||||
|
||||
ciphers = ','.join(new_ciphers)
|
||||
set_directive(NSS_CONF, 'NSSCipherSuite', ciphers, False)
|
||||
root_logger.info('Updated Apache cipher list')
|
||||
|
||||
|
||||
def restart_http():
|
||||
root_logger.info('Restarting HTTP')
|
||||
fstore = sysrestore.FileStore('/var/lib/ipa/sysrestore')
|
||||
http = HTTPInstance(fstore)
|
||||
http.restart()
|
||||
|
||||
|
||||
def main():
|
||||
if os.getegid() != 0:
|
||||
sys.exit("Must be root to run this script")
|
||||
@@ -187,8 +110,6 @@ def main():
|
||||
|
||||
add_ca_schema()
|
||||
restart_pki_ds()
|
||||
update_mod_nss_cipher_suite()
|
||||
restart_http()
|
||||
|
||||
root_logger.info('Schema updated successfully')
|
||||
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
#!/usr/bin/python3
|
||||
"""Helper script to test LGTM config
|
||||
|
||||
$ contrib/lgtm_container.py > Dockerfile
|
||||
$ docker build -t lgtm .
|
||||
"""
|
||||
import os
|
||||
import yaml
|
||||
|
||||
LGTM_YML = os.path.join(os.path.dirname(__file__), '..', '.lgtm.yml')
|
||||
|
||||
|
||||
def main():
|
||||
with open(LGTM_YML) as f:
|
||||
cfg = yaml.safe_load(f)
|
||||
|
||||
python = cfg['extraction']['python']
|
||||
|
||||
print("""\
|
||||
FROM ubuntu:bionic
|
||||
RUN apt-get update && \
|
||||
apt-get install -y {dpkg} python3-venv && \
|
||||
apt-get clean
|
||||
RUN python3 -m venv /venv
|
||||
RUN /venv/bin/pip install wheel
|
||||
RUN /venv/bin/pip install {pypkg}
|
||||
ADD . /freeipa
|
||||
RUN cd /freeipa && ./autogen.sh --with-ipaplatform=debian
|
||||
""".format(
|
||||
dpkg=' '.join(python['prepare']['packages']),
|
||||
pypkg=' '.join(python['python_setup']['requirements'])
|
||||
))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python3
|
||||
#!/usr/bin/env python
|
||||
#
|
||||
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
|
||||
#
|
||||
@@ -35,7 +35,8 @@ You may also have to enable a development COPR.
|
||||
|
||||
$ sudo dnf install -y dnf-plugins-core
|
||||
$ sudo dnf builddep --spec freeipa.spec.in
|
||||
$ sudo dnf install -y python3-werkzeug python3-watchdog
|
||||
$ sudo dnf install -y python-werkzeug python2-watchdog \
|
||||
python3-werkzeug python3-watchdog
|
||||
$ ./autogen.sh
|
||||
|
||||
For more information see
|
||||
@@ -60,7 +61,6 @@ from ipalib.errors import NetworkError
|
||||
from ipalib.krb_utils import krb5_parse_ccache
|
||||
from ipalib.krb_utils import krb5_unparse_ccache
|
||||
|
||||
import gssapi
|
||||
# pylint: disable=import-error
|
||||
from werkzeug.contrib.profiler import ProfilerMiddleware
|
||||
from werkzeug.exceptions import NotFound
|
||||
@@ -106,20 +106,15 @@ def get_ccname():
|
||||
return krb5_unparse_ccache(scheme, location)
|
||||
|
||||
|
||||
class KRBCheater:
|
||||
"""Add KRB5CCNAME and GSS_NAME to WSGI environ
|
||||
class KRBCheater(object):
|
||||
"""Add KRB5CCNAME to WSGI environ
|
||||
"""
|
||||
def __init__(self, app, ccname):
|
||||
self.app = app
|
||||
self.ccname = ccname
|
||||
self.creds = gssapi.Credentials(
|
||||
usage='initiate',
|
||||
store={'ccache': ccname}
|
||||
)
|
||||
|
||||
def __call__(self, environ, start_response):
|
||||
environ['KRB5CCNAME'] = self.ccname
|
||||
environ['GSS_NAME'] = self.creds.name
|
||||
return self.app(environ, start_response)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user