refresh patches

debian/patches/check-dbus-before-starting.diff

@@ -1,8 +1,6 @@
-Index: freeipa/ipa-client/ipa-install/ipa-client-install
-===================================================================
---- freeipa.orig/ipa-client/ipa-install/ipa-client-install	2013-02-21 01:19:38.000000000 +0000
-+++ freeipa/ipa-client/ipa-install/ipa-client-install	2013-02-21 02:03:54.000000000 +0000
-@@ -353,10 +353,11 @@
+--- a/ipa-client/ipa-install/ipa-client-install
++++ b/ipa-client/ipa-install/ipa-client-install
+@@ -372,10 +372,11 @@ def uninstall(options, env):
      # Always start certmonger. We can't untrack something if it isn't
      # running
      messagebus = ipaservices.knownservices.messagebus
@@ -18,7 +16,7 @@ Index: freeipa/ipa-client/ipa-install/ipa-client-install
  
      cmonger = ipaservices.knownservices.certmonger
      try:
-@@ -868,10 +869,11 @@
+@@ -970,10 +971,11 @@ def configure_certmonger(fstore, subject
      principal = 'host/%s@%s' % (hostname, cli_realm)
  
      messagebus = ipaservices.knownservices.messagebus

debian/patches/correct-python-path.diff

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -44,7 +44,7 @@ ifneq ($(DEVELOPER_MODE),0)
+@@ -50,7 +50,7 @@ ifneq ($(DEVELOPER_MODE),0)
  LINT_OPTIONS=--no-fail
  endif
  

debian/patches/fix-install-layout.diff

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -76,9 +76,9 @@ client-install: client client-dirs
+@@ -82,9 +82,9 @@ client-install: client client-dirs
  	done
  	cd install/po && $(MAKE) install || exit 1;
  	if [ "$(DESTDIR)" = "" ]; then \

debian/patches/fix-ldap-conf-path.diff

@@ -1,13 +1,11 @@
-Index: freeipa/ipa-client/ipa-install/ipa-client-install
-===================================================================
---- freeipa.orig/ipa-client/ipa-install/ipa-client-install	2013-02-12 23:09:34.000000000 +0000
-+++ freeipa/ipa-client/ipa-install/ipa-client-install	2013-02-21 01:19:38.000000000 +0000
-@@ -770,7 +770,7 @@
-             {'name':'TLS_CACERT', 'type':'option', 'value':CACERT},
-             {'name':'empty', 'type':'empty'}]
+--- a/ipa-client/ipa-install/ipa-client-install
++++ b/ipa-client/ipa-install/ipa-client-install
+@@ -854,7 +854,7 @@ def configure_openldap_conf(fstore, cli_
+             {'action':'addifnotset', 'name':'TLS_CACERT', 'type':'option',
+                 'value':CACERT},]
  
 -    target_fname = '/etc/openldap/ldap.conf'
 +    target_fname = '/etc/ldap/ldap.conf'
      fstore.backup_file(target_fname)
-     ldapconf.newConf(target_fname, opts)
-     os.chmod(target_fname, 0644)
+ 
+     error_msg = "Configuring {path} failed with: {err}"

debian/patches/fix-string-format.diff

@@ -39,7 +39,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
      return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
 +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipa_pwd_extop.c
-@@ -545,7 +545,7 @@ free_and_return:
+@@ -549,7 +549,7 @@ free_and_return:
  	if (targetEntry) slapi_entry_free(targetEntry);
  	if (ber) ber_free(ber, 1);
  
@@ -48,7 +48,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
  	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
  
  	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1115,7 +1115,7 @@ free_and_return:
+@@ -1119,7 +1119,7 @@ free_and_return:
  
          if (rc == LDAP_SUCCESS)
              errMesg = NULL;
@@ -57,7 +57,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
  	slapi_send_ldap_result(pb, rc, NULL, errMesg, 0, NULL);
  
  	return SLAPI_PLUGIN_EXTENDED_SENT_RESULT;
-@@ -1142,7 +1142,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
+@@ -1146,7 +1146,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
  	if (slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &oid) != 0) {
  		errMesg = "Could not get OID value from request.\n";
  		rc = LDAP_OPERATIONS_ERROR;
@@ -66,7 +66,7 @@ Subject: [PATCH] Fix -Wformat-security warnings
  		goto free_and_return;
  	} else {
  	        LOG("Received extended operation request with OID %s\n", oid);
-@@ -1165,7 +1165,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
+@@ -1169,7 +1169,7 @@ static int ipapwd_extop(Slapi_PBlock *pb
  free_and_return:
  	if (krbcfg) free_ipapwd_krbcfg(&krbcfg);
  

debian/patches/no-test-lang.diff

@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -92,7 +92,7 @@ client-dirs:
+@@ -98,7 +98,7 @@ client-dirs:
  
  lint: bootstrap-autogen
  	./make-lint $(LINT_OPTIONS)

debian/patches/no-testcert.patch

@@ -7,7 +7,7 @@ they need a working certificate server running
 
 --- a/Makefile
 +++ b/Makefile
-@@ -96,7 +96,7 @@ lint: bootstrap-autogen
+@@ -102,7 +102,7 @@ lint: bootstrap-autogen
  
  
  test:

debian/patches/prefix.patch

@@ -5,7 +5,7 @@ use the debian layout when installing python modules
 
 --- a/Makefile
 +++ b/Makefile
-@@ -140,7 +140,7 @@ server-install: server
+@@ -146,7 +146,7 @@ server-install: server
  	if [ "$(DESTDIR)" = "" ]; then \
  		$(PYTHON) setup.py install; \
  	else \