diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/0100-out-of-bounds.patch (renamed from debian/patches/100-out-of-bounds.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0600-typo-man.patch (renamed from debian/patches/003-typo-man.patch) | 0 | ||||
| -rw-r--r-- | debian/patches/0700-init.patch (renamed from debian/patches/005-init.patch) | 40 | ||||
| -rw-r--r-- | debian/patches/series | 6 |
5 files changed, 24 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog index 86b8f68..9a6388e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ipmiutil (2.9.7-1) UNRELEASED; urgency=medium * New upstream release + * Refresh and rename patches. -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 06 Nov 2015 01:45:52 +0100 diff --git a/debian/patches/100-out-of-bounds.patch b/debian/patches/0100-out-of-bounds.patch index 19ba67b..19ba67b 100644 --- a/debian/patches/100-out-of-bounds.patch +++ b/debian/patches/0100-out-of-bounds.patch diff --git a/debian/patches/003-typo-man.patch b/debian/patches/0600-typo-man.patch index 9d4be3e..9d4be3e 100644 --- a/debian/patches/003-typo-man.patch +++ b/debian/patches/0600-typo-man.patch diff --git a/debian/patches/005-init.patch b/debian/patches/0700-init.patch index 954e034..42c60c0 100644 --- a/debian/patches/005-init.patch +++ b/debian/patches/0700-init.patch @@ -129,26 +129,6 @@ Index: trunk/scripts/ipmiutil_evt esac exit $? - -Index: trunk/configure.ac -=================================================================== ---- trunk.orig/configure.ac -+++ trunk/configure.ac -@@ -374,11 +374,11 @@ else - MD2_CFLAGS="-DSKIP_MD2" - init0=/etc/rc.d/init.d - fi -- if test $isredhat -eq 0 ; then -+# if test $isredhat -eq 0 ; then - # set default start/stop for init scripts -- sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts -- sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts -- fi -+# sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts -+# sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts -+# fi - if test -f "$LIB_DIR/libcrypto.so"; then - strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1 - if test $? -ne 0; then Index: trunk/scripts/ipmi_info =================================================================== --- trunk.orig/scripts/ipmi_info @@ -217,3 +197,23 @@ Index: trunk/scripts/ipmi_port.service WantedBy=multi-user.target - - +Index: trunk/configure.ac +=================================================================== +--- trunk.orig/configure.ac ++++ trunk/configure.ac +@@ -389,11 +389,11 @@ else + MD2_CFLAGS="-DSKIP_MD2" + init0=/etc/rc.d/init.d + fi +- if test $isredhat -eq 0 ; then ++# if test $isredhat -eq 0 ; then + # set default start/stop for init scripts +- sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts +- sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts +- fi ++# sed -i 's/# Default-Start:/# Default-Start: 3 4 5/' $init_scripts ++# sed -i 's/# Default-Stop:/# Default-Stop: 0 1 2 6/' $init_scripts ++# fi + if test -f "$LIB_DIR/libcrypto.so"; then + strings $LIB_DIR/libcrypto.so | grep EVP_md2 >/dev/null 2>&1 + if test $? -ne 0; then diff --git a/debian/patches/series b/debian/patches/series index 2777650..6bb1f7e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -#100-out-of-bounds.patch -005-init.patch -003-typo-man.patch +#0100-out-of-bounds.patch +0700-init.patch +0600-typo-man.patch |