projects
/
ckermit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
16220c6
)
annotate patches;remove nostrip handling from debian/rules
author
Ian Beckwith
<ianb@erislabs.net>
Wed, 16 Jan 2008 11:09:19 +0000
(11:09 +0000)
committer
Ian Beckwith
<ianb@erislabs.net>
Wed, 16 Jan 2008 11:09:19 +0000
(11:09 +0000)
debian/changelog
patch
|
blob
|
history
debian/patches/01_makefile-destdir-support
patch
|
blob
|
history
debian/patches/02_man-hyphen-quoting
patch
|
blob
|
history
debian/patches/03_fix-if-else
patch
|
blob
|
history
debian/patches/04_pam-password-prompting
patch
|
blob
|
history
debian/patches/05_ck_patch
patch
|
blob
|
history
debian/rules
patch
|
blob
|
history
diff --git
a/debian/changelog
b/debian/changelog
index
b88ab86
..
c38c20e
100644
(file)
--- a/
debian/changelog
+++ b/
debian/changelog
@@
-1,11
+1,11
@@
ckermit (211-10) unstable; urgency=low
* Add DM-Upload-Allowed: yes.
ckermit (211-10) unstable; urgency=low
* Add DM-Upload-Allowed: yes.
- * Switch to linking with libsocks4 as libsocksd
has been removed from
-
testing
.
- *
Use quilt to manage patches to source
.
+ * Switch to linking with libsocks4 as libsocksd
is no longer in testing.
+
* Split up source patches and apply them at build time with quilt
.
+ *
Remove nostrip handling, dh_strip does it for us
.
- -- Ian Beckwith <ianb@erislabs.net>
Tue, 15 Jan 2008 13:47:29
+0000
+ -- Ian Beckwith <ianb@erislabs.net>
Wed, 16 Jan 2008 11:00:20
+0000
ckermit (211-9) unstable; urgency=low
ckermit (211-9) unstable; urgency=low
diff --git
a/debian/patches/01_makefile-destdir-support
b/debian/patches/01_makefile-destdir-support
index
196b936
..
d3d2854
100644
(file)
--- a/
debian/patches/01_makefile-destdir-support
+++ b/
debian/patches/01_makefile-destdir-support
@@
-1,3
+1,4
@@
+Patch makefile to support install to a staging area with DESTDIR
--- ckermit-211.orig/makefile
+++ ckermit-211/makefile
@@ -998,7 +998,7 @@
--- ckermit-211.orig/makefile
+++ ckermit-211/makefile
@@ -998,7 +998,7 @@
diff --git
a/debian/patches/02_man-hyphen-quoting
b/debian/patches/02_man-hyphen-quoting
index
fe8a389
..
84a7f82
100644
(file)
--- a/
debian/patches/02_man-hyphen-quoting
+++ b/
debian/patches/02_man-hyphen-quoting
@@
-1,3
+1,4
@@
+Correctly escape hyphens in man page
--- ckermit-211.orig/ckuker.nr
+++ ckermit-211/ckuker.nr
@@ -3,17 +3,17 @@
--- ckermit-211.orig/ckuker.nr
+++ ckermit-211/ckuker.nr
@@ -3,17 +3,17 @@
diff --git
a/debian/patches/03_fix-if-else
b/debian/patches/03_fix-if-else
index
e8f5dc6
..
9c12683
100644
(file)
--- a/
debian/patches/03_fix-if-else
+++ b/
debian/patches/03_fix-if-else
@@
-1,3
+1,5
@@
+Backported fix from ckdaily snapshot to fix parsing of if/else constructs
+See #323510.
--- ckermit-211.orig/ckuus6.c
+++ ckermit-211/ckuus6.c
@@ -6607,7 +6607,7 @@
--- ckermit-211.orig/ckuus6.c
+++ ckermit-211/ckuus6.c
@@ -6607,7 +6607,7 @@
diff --git
a/debian/patches/04_pam-password-prompting
b/debian/patches/04_pam-password-prompting
index
4efd800
..
28d0791
100644
(file)
--- a/
debian/patches/04_pam-password-prompting
+++ b/
debian/patches/04_pam-password-prompting
@@
-1,3
+1,6
@@
+Make IKSD authentication (using PAM) ask for a password when an
+invalid username has been given, to avoid disclosing which account
+names are valid. See #417247.
--- ckermit-211.orig/ckufio.c
+++ ckermit-211/ckufio.c
@@ -490,6 +490,9 @@
--- ckermit-211.orig/ckufio.c
+++ ckermit-211/ckufio.c
@@ -490,6 +490,9 @@
diff --git
a/debian/patches/05_ck_patch
b/debian/patches/05_ck_patch
index
407d0ef
..
de27224
100644
(file)
--- a/
debian/patches/05_ck_patch
+++ b/
debian/patches/05_ck_patch
@@
-1,3
+1,4
@@
+As requested by upstream, set ck_patch to indicate changes from upstream source.
--- ckermit-211.orig/ckcmai.c
+++ ckermit-211/ckcmai.c
@@ -97,7 +97,7 @@
--- ckermit-211.orig/ckcmai.c
+++ ckermit-211/ckcmai.c
@@ -97,7 +97,7 @@
diff --git
a/debian/rules
b/debian/rules
index
4ebedd2
..
1cf881c
100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-27,10
+27,6
@@
MAKEOPTS=-f makefile DESTDIR=\"$(BUILDDIR)\" BINDIR=/usr/bin MANDIR=/usr/share/m
#MAKETARGET=linux+krb5+krb4+openssl+shadow+pam
MAKETARGET=linux+shadow+pam
#MAKETARGET=linux+krb5+krb4+openssl+shadow+pam
MAKETARGET=linux+shadow+pam
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
configure: configure-stamp
configure-stamp: patch
dh_testdir
configure: configure-stamp
configure-stamp: patch
dh_testdir