patches: Refreshed.

This commit is contained in:
Timo Aaltonen 2016-12-01 08:30:36 +02:00
parent 36019f0e75
commit 14da8940ea
11 changed files with 31 additions and 32 deletions

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ freeipa (4.4.2-1) UNRELEASED; urgency=medium
* New upstream release.
* configure-apache-from-installer.diff: Dropped, upstream.
* patches: Refreshed.
-- Timo Aaltonen <tjaalton@debian.org> Thu, 01 Dec 2016 08:25:03 +0200

View File

@ -654,7 +654,7 @@ Date: Fri Mar 1 12:21:00 2013 +0200
+tasks = DebianTaskNamespace()
--- a/ipaplatform/setup.py.in
+++ b/ipaplatform/setup.py.in
@@ -67,6 +67,7 @@ def setup_package():
@@ -66,6 +66,7 @@ def setup_package():
package_dir = {'ipaplatform': ''},
packages = ["ipaplatform",
"ipaplatform.base",
@ -664,7 +664,7 @@ Date: Fri Mar 1 12:21:00 2013 +0200
"ipaplatform.rhel"],
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -50,6 +50,8 @@ class NTPInstance(service.Service):
@@ -70,6 +70,8 @@ class NTPInstance(service.Service):
os = "fedora"
elif ipautil.file_exists(paths.ETC_REDHAT_RELEASE):
os = "rhel"

View File

@ -1,6 +1,6 @@
--- a/ipaserver/install/opendnssecinstance.py
+++ b/ipaserver/install/opendnssecinstance.py
@@ -212,6 +212,9 @@ class OpenDNSSECInstance(service.Service
@@ -206,6 +206,9 @@ class OpenDNSSECInstance(service.Service
if not self.fstore.has_file(paths.SYSCONFIG_ODS):
self.fstore.backup_file(paths.SYSCONFIG_ODS)

View File

@ -8,7 +8,7 @@
self.step("restarting httpd", self.__start)
self.step("configuring httpd to start on boot", self.__enable)
self.step("enabling oddjobd", self.enable_and_start_oddjobd)
@@ -507,6 +508,8 @@ class HTTPInstance(service.Service):
@@ -508,6 +509,8 @@ class HTTPInstance(service.Service):
except Exception:
pass
@ -17,4 +17,3 @@
self.stop_tracking_certificates()
helper = self.restore_state('certmonger_ipa_helper')

View File

@ -10,7 +10,7 @@ Description: Fix paths
# Configure mod_wsgi handler for /ipa
@@ -62,9 +62,9 @@ WSGIScriptReloading Off
@@ -63,9 +63,9 @@ WSGIScriptReloading Off
<Location "/ipa">
AuthType GSSAPI
AuthName "Kerberos Login"
@ -23,7 +23,7 @@ Description: Fix paths
GssapiDelegCcacheUnique On
GssapiUseS4U2Proxy on
GssapiAllowedMech krb5
@@ -110,7 +110,7 @@ WSGIScriptReloading Off
@@ -111,7 +111,7 @@ WSGIScriptReloading Off
# Custodia stuff is redirected to the custodia daemon
# after authentication
<Location "/ipa/keys/">
@ -32,7 +32,7 @@ Description: Fix paths
RequestHeader set GSS_NAME %{GSS_NAME}s
RequestHeader set REMOTE_USER %{REMOTE_USER}s
</Location>
@@ -144,8 +144,8 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
@@ -145,8 +145,8 @@ Alias /ipa/crl "$CRL_PUBLISH_PATH"
# List explicitly only the fonts we want to serve

View File

@ -16,9 +16,9 @@ Description: fix named.conf template
+ statistics-file "named_stats.txt";
+ memstatistics-file "named_mem_stats.txt";
forward $FORWARD_POLICY;
forwarders {$FORWARDERS};
@@ -30,18 +30,14 @@ options {
// Any host is permitted to issue recursive queries
allow-recursion { any; };
@@ -27,18 +27,14 @@ options {
* By default, SELinux policy does not allow named to modify the /var/named directory,
* so put the default debug log file in data/ :
*/

View File

@ -1,8 +1,8 @@
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -1073,7 +1073,7 @@ def promote_check(installer):
raise RuntimeError("CA cert file is not available! Please reinstall"
"the client and try again.")
@@ -630,7 +630,7 @@ def install_check(installer):
finally:
shutil.rmtree(tmp_db_dir)
- ldapuri = 'ldaps://%s' % ipautil.format_netloc(config.master_host_name)
+ ldapuri = 'ldap://%s' % ipautil.format_netloc(config.master_host_name)

View File

@ -1,6 +1,6 @@
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -335,9 +335,9 @@ class LDAPUpdate:
@@ -334,9 +334,9 @@ class LDAPUpdate:
bits = platform.architecture()[0]
if bits == "64bit":
@ -12,4 +12,3 @@
def _template_str(self, s):
try:

View File

@ -5,7 +5,7 @@ use the debian layout when installing python modules
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,9 @@ client-install: client client-dirs
@@ -118,9 +118,9 @@ client-install: client client-dirs
cd install/po && $(MAKE) install || exit 1;
@for subdir in $(CLIENTPYDIRS); do \
if [ "$(DESTDIR)" = "" ]; then \
@ -17,7 +17,7 @@ use the debian layout when installing python modules
fi \
done
@@ -198,11 +198,11 @@ server: version-update
@@ -215,11 +215,11 @@ server: version-update
server-install: server
if [ "$(DESTDIR)" = "" ]; then \
@ -33,7 +33,7 @@ use the debian layout when installing python modules
fi
tests: version-update tests-man-autogen
@@ -213,7 +213,7 @@ tests-install: tests
@@ -230,7 +230,7 @@ tests-install: tests
if [ "$(DESTDIR)" = "" ]; then \
cd ipatests; $(PYTHON) setup.py install; \
else \

View File

@ -6,8 +6,8 @@ Date: Tue Mar 29 21:33:15 2016 +0300
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -158,7 +158,6 @@ Requires: pki-ca >= 10.2.6-19
Requires: pki-kra >= 10.2.6-19
@@ -165,7 +165,6 @@ Requires: pki-ca >= 10.3.5-6
Requires: pki-kra >= 10.3.5-6
Requires(preun): python systemd-units
Requires(postun): python systemd-units
-Requires: zip
@ -503,7 +503,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300
\ No newline at end of file
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -183,7 +183,6 @@ class BasePathNamespace(object):
@@ -184,7 +184,6 @@ class BasePathNamespace(object):
BIN_TIMEOUT = "/usr/bin/timeout"
UPDATE_CA_TRUST = "/usr/bin/update-ca-trust"
BIN_CURL = "/usr/bin/curl"
@ -511,7 +511,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300
BIND_LDAP_SO = "/usr/lib/bind/ldap.so"
BIND_LDAP_DNS_IPA_WORKDIR = "/var/named/dyndb-ldap/ipa/"
BIND_LDAP_DNS_ZONE_WORKDIR = "/var/named/dyndb-ldap/ipa/master/"
@@ -226,12 +225,9 @@ class BasePathNamespace(object):
@@ -231,12 +230,9 @@ class BasePathNamespace(object):
USERADD = "/usr/sbin/useradd"
USR_SHARE_IPA_DIR = "/usr/share/ipa/"
CA_TOPOLOGY_ULDIF = "/usr/share/ipa/ca-topology.uldif"
@ -544,7 +544,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300
if not self.promote:
self.step("publish CA cert", self.__publish_ca_cert)
self.step("clean up any existing httpd ccache", self.remove_httpd_ccache)
@@ -375,42 +373,6 @@ class HTTPInstance(service.Service):
@@ -376,42 +374,6 @@ class HTTPInstance(service.Service):
db = certs.CertDB(self.realm, subject_base=self.subject_base)
self.import_ca_certs(db, self.ca_is_configured)
@ -589,7 +589,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300
ca_db.publish_ca_cert(paths.CA_CRT)
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -181,12 +181,10 @@ def install_http(config, auto_redirect,
@@ -186,12 +186,10 @@ def install_http(config, auto_redirect,
http = httpinstance.HTTPInstance()
http.create_instance(
config.realm_name, config.host_name, config.domain_name,
@ -605,7 +605,7 @@ Date: Tue Mar 29 21:33:15 2016 +0300
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -283,16 +283,6 @@ def cleanup_adtrust(fstore):
@@ -269,16 +269,6 @@ def cleanup_adtrust(fstore):
root_logger.debug('Removing %s from backup', backed_up_file)
@ -622,11 +622,11 @@ Date: Tue Mar 29 21:33:15 2016 +0300
def ca_configure_profiles_acl(ca):
root_logger.info('[Authorizing RA Agent to modify profiles]')
@@ -1657,7 +1647,6 @@ def upgrade_configuration():
@@ -1716,7 +1706,6 @@ def upgrade_configuration():
cleanup_kdc(fstore)
cleanup_adtrust(fstore)
- setup_firefox_extension(fstore)
add_ca_dns_records()
# Any of the following functions returns True iff the named.conf file
bind = bindinstance.BindInstance(fstore)
if bind.is_configured() and not bind.is_running():

View File

@ -13,7 +13,7 @@ Description: service apache2 restart fails on sid, so don't do that
self.backup_state("enabled", self.is_enabled())
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -142,7 +142,8 @@ def main():
@@ -153,7 +153,8 @@ def main():
fstore = sysrestore.FileStore(paths.SYSRESTORE)
http = httpinstance.HTTPInstance(fstore)
service.print_msg("Restarting the web server")
@ -25,7 +25,7 @@ Description: service apache2 restart fails on sid, so don't do that
ipautil.run(['ipactl', 'start', '--ignore-service-failures'],
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -999,7 +999,8 @@ def install(installer):
@@ -877,7 +877,8 @@ def install(installer):
# Restart httpd to pick up the new IPA configuration
service.print_msg("Restarting the web server")
@ -37,7 +37,7 @@ Description: service apache2 restart fails on sid, so don't do that
# from restart to avoid waiting for its creation
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -856,7 +856,8 @@ def install(installer):
@@ -881,7 +881,8 @@ def install(installer):
# Restart httpd to pick up the new IPA configuration
service.print_msg("Restarting the web server")