mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2024-12-24 16:10:02 -06:00
Add DEP-3 compliant headers to the patches.
and drop obsolete patches
This commit is contained in:
Timo Aaltonen
parent
3dfd8a91ee
commit
7f6c2bb992
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -28,5 +28,6 @@ freeipa (2.1.4-1) UNRELEASED; urgency=low
|
||||
* create-client-dirs.patch: Add a patch from upstream that creates
|
||||
/etc/ipa and /var/lib/ipa-client/sysrestore paths. Stop creating them in
|
||||
rules.
|
||||
* Add DEP-3 compliant headers to the patches.
|
||||
|
||||
-- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Nov 2011 10:52:25 -0400
|
||||
|
||||
12
debian/patches/01_fix_init_dir.patch
vendored
12
debian/patches/01_fix_init_dir.patch
vendored
@ -1,12 +0,0 @@
|
||||
diff -urNad freeipa-1.1.0~/ipa-server/ipa-kpasswd/Makefile.am freeipa-1.1.0/ipa-server/ipa-kpasswd/Makefile.am
|
||||
--- freeipa-1.1.0~/daemons/ipa-kpasswd/Makefile.am 2008-06-11 16:24:28.000000000 +0200
|
||||
+++ freeipa-1.1.0/daemons/ipa-kpasswd/Makefile.am 2008-07-09 07:43:50.000000000 +0200
|
||||
@@ -43,7 +43,7 @@
|
||||
*~ \
|
||||
Makefile.in
|
||||
|
||||
-initdir=$(sysconfdir)/rc.d/init.d
|
||||
+initdir=$(sysconfdir)/init.d
|
||||
|
||||
install-data-hook: ipa_kpasswd.init
|
||||
|
||||
46
debian/patches/02_configure.patch
vendored
46
debian/patches/02_configure.patch
vendored
@ -1,46 +0,0 @@
|
||||
diff -urNad freeipa-1.2.1~/ipa-server/configure.ac freeipa-1.2.1/ipa-server/configure.ac
|
||||
--- freeipa-1.2.1~/ipa-server/configure.ac 2008-12-26 12:13:30.000000000 +0100
|
||||
+++ freeipa-1.2.1/ipa-server/configure.ac 2008-12-26 12:13:53.000000000 +0100
|
||||
@@ -22,8 +22,8 @@
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl - Check for NSPR
|
||||
dnl ---------------------------------------------------------------------------
|
||||
-AC_CHECK_HEADER(nspr4/nspr.h)
|
||||
-if test "x$ac_cv_header_nspr4_nspr_h" = "xno" ; then
|
||||
+AC_CHECK_HEADER(nspr/nspr.h)
|
||||
+if test "x$ac_cv_header_nspr_nspr_h" = "xno" ; then
|
||||
AC_MSG_ERROR([Required NSPR header not available (nspr-devel)])
|
||||
fi
|
||||
|
||||
@@ -31,10 +31,10 @@
|
||||
dnl - Check for NSS
|
||||
dnl ---------------------------------------------------------------------------
|
||||
SAVE_CPPFLAGS=$CPPFLAGS
|
||||
-CPPFLAGS="-I/usr/include/nspr4"
|
||||
-AC_CHECK_HEADER(nss3/nss.h)
|
||||
+CPPFLAGS="-I/usr/include/nspr"
|
||||
+AC_CHECK_HEADER(nss/nss.h)
|
||||
CPPFLAGS=$SAVE_CPPFLAGS
|
||||
-if test "x$ac_cv_header_nss3_nss_h" = "xno" ; then
|
||||
+if test "x$ac_cv_header_nss_nss_h" = "xno" ; then
|
||||
AC_MSG_ERROR([Required NSS header not available (nss-devel)])
|
||||
fi
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
# Need to hack CPPFLAGS to be able to correctly detetct slapi-plugin.h
|
||||
SAVE_CPPFLAGS=$CPPFLAGS
|
||||
-CPPFLAGS="-I/usr/include/nspr4"
|
||||
+CPPFLAGS="-I/usr/include/nspr -I/usr/include/mozldap"
|
||||
AC_CHECK_HEADER(dirsrv/slapi-plugin.h)
|
||||
CPPFLAGS=$SAVE_CPPFLAGS
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
dnl The mozldap libraries are always needed because ipa-slapi-plugins/dna/
|
||||
dnl will not build against OpenLDAP.
|
||||
SAVE_CPPFLAGS=$CPPFLAGS
|
||||
-CPPFLAGS="-I/usr/include/nspr4 -I/usr/include/nss3"
|
||||
+CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss"
|
||||
AC_CHECK_HEADER(svrcore.h)
|
||||
if test "x$ac_cv_header_svrcore_h" = "xno" ; then
|
||||
AC_MSG_ERROR([Required svrcore header not available (svrcore-devel)])
|
||||
5
debian/patches/add_debian.py.patch
vendored
5
debian/patches/add_debian.py.patch
vendored
@ -1,3 +1,8 @@
|
||||
Author: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Date: Fri Oct 28 15:57:04 2011 +0300
|
||||
|
||||
Add add_debian.py.patch, platform support code.
|
||||
|
||||
diff --git a/ipapython/platform/debian.py b/ipapython/platform/debian.py
|
||||
index e69de29..ba8bf2d 100644
|
||||
--- a/ipapython/platform/debian.py
|
||||
|
||||
5
debian/patches/fix_dnsclient.py.patch
vendored
5
debian/patches/fix_dnsclient.py.patch
vendored
@ -1,3 +1,8 @@
|
||||
Author: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Date: Fri Oct 28 15:44:52 2011 +0300
|
||||
|
||||
Add fix_dnsclient.py.patch, we don't use authconfig.
|
||||
|
||||
diff --git a/ipapython/dnsclient.py b/ipapython/dnsclient.py
|
||||
index 9a59d9b..857e1c7 100644
|
||||
--- a/ipapython/dnsclient.py
|
||||
|
||||
5
debian/patches/no-arrows.patch
vendored
5
debian/patches/no-arrows.patch
vendored
@ -1,3 +1,8 @@
|
||||
Author: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Date: Tue Nov 1 10:53:18 2011 -0400
|
||||
|
||||
Add no-arrows.patch to not fail test_lang.
|
||||
|
||||
diff --git a/install/po/Makefile.in b/install/po/Makefile.in
|
||||
index 49d125d..e04341b 100644
|
||||
--- a/install/po/Makefile.in
|
||||
|
||||
7
debian/patches/no-testcert.patch
vendored
7
debian/patches/no-testcert.patch
vendored
@ -1,3 +1,10 @@
|
||||
Author: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Date: Tue Nov 1 11:48:27 2011 -0400
|
||||
|
||||
Add no-testcert.patch to not fail make-testcert.
|
||||
|
||||
they need a working certificate server running
|
||||
|
||||
Index: freeipa/Makefile
|
||||
===================================================================
|
||||
--- freeipa.orig/Makefile 2011-12-31 04:02:56.140475799 +0200
|
||||
|
||||
5
debian/patches/prefix.patch
vendored
5
debian/patches/prefix.patch
vendored
@ -1,3 +1,8 @@
|
||||
Author: Timo Aaltonen <tjaalton@ubuntu.com>
|
||||
Date: Mon Jan 2 16:09:40 2012 +0200
|
||||
|
||||
use the debian layout when installing python modules
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 3cd08e2..97af4c0 100644
|
||||
--- a/Makefile
|
||||
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
@ -1,5 +1,3 @@
|
||||
01_fix_init_dir.patch
|
||||
#02_configure.patch
|
||||
fix_dnsclient.py.patch
|
||||
add_debian.py.patch
|
||||
include-stdint.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user