Browse Source

Patch queue maintenance

Christoph Biedl 6 years ago
parent
commit
63a0f99733

debian/patches/cherry-pick.1.4.0-11-g4ea2db6.ff.patch → debian/patches/cherry-pick.1.4.0-11-g4ea2db6.ff.bcrelay-c-replace-sprintf-with-snprintf.patch


+ 3 - 3
debian/patches/cherry-pick.1.4.0-14-gb84360b.patch

@@ -1,6 +1,6 @@
-Subject: pptpctrl: exit when bailing
-Origin: b84360bb7d2d1c603a9e99f0640e962673c135e7
-Author: James Cameron <quozl@laptop.org>
+Subject: Pptpctrl: exit when bailing
+Origin: 1.4.0-14-gb84360b
+Upstream-Author: James Cameron <quozl@laptop.org>
 Date: Sat Oct 18 15:08:00 2014 +1100
 
     Commit 0770455 in 2004 removed the call to exit, and so now pptpctrl

debian/patches/build_hardening-flags.patch → debian/patches/local.build_hardening-flags.patch


debian/patches/build_plugin.patch → debian/patches/local.build_plugin.patch


debian/patches/fix-typo-in-pptpd-manpage.patch → debian/patches/local.fix-typo-in-pptpd-help.patch


+ 8 - 5
debian/patches/series

@@ -1,6 +1,9 @@
-build_hardening-flags.patch
-build_plugin.patch
+# cherry-picked commits. Keep in chronlogical order
 cherry-pick.1.4.0-10-g6adffc1.bcrelay-fix-typo.patch
-cherry-pick.1.4.0-11-g4ea2db6.ff.patch
-cherry-pick.1.4.0-14-gb84360b.patch
-fix-typo-in-pptpd-manpage.patch
+cherry-pick.1.4.0-11-g4ea2db6.ff.bcrelay-c-replace-sprintf-with-snprintf.patch
+cherry-pick.1.4.0-14-gb84360b.pptpctrl-exit-when-bailing.patch
+
+# local modifications
+local.build_hardening-flags.patch
+local.build_plugin.patch
+local.fix-typo-in-pptpd-help.patch