Mail archive
alpine-aports

[alpine-aports] [PATCH] main/sysklogd: Apply diffs that weren't applied since modernization.

From: Przemyslaw Pawelczyk <przemoc_at_zoho.com>
Date: Thu, 23 Nov 2017 00:56:34 +0100

APKBUILD modernization commit 9c2d3b2f6b2eb35dc349ef1eeafac6bedef96ec0
didn't take into account that only *.patch files are applied by default
by abuild. We may improve abuild behavior in future (possibly after
releasing Alpine Linux 3.7), but for now let's rename patches from
*.diff to *.patch.
---
I guess it's too late to change abuild behavior to also apply *.diff,
but I think it should be done ultimately, because if there are patches
circulating around the web, borrowed from other distros, etc., then it's
nicer to preserve their names than be unique for no very good reason.
(It's maybe not that much apparent in case of this particular package.)
 main/sysklogd/APKBUILD                                 | 18 +++++++++---------
 .../{ksym-fclose-fix.diff => ksym-fclose-fix.patch}    |  0
 ...f => sysklogd-1.4.2-caen-owl-klogd-drop-root.patch} |  0
 ...diff => sysklogd-1.4.2-caen-owl-syslogd-bind.patch} |  0
 ...=> sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch} |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename main/sysklogd/{ksym-fclose-fix.diff => ksym-fclose-fix.patch} (100%)
 rename main/sysklogd/{sysklogd-1.4.2-caen-owl-klogd-drop-root.diff => sysklogd-1.4.2-caen-owl-klogd-drop-root.patch} (100%)
 rename main/sysklogd/{sysklogd-1.4.2-caen-owl-syslogd-bind.diff => sysklogd-1.4.2-caen-owl-syslogd-bind.patch} (100%)
 rename main/sysklogd/{sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff => sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch} (100%)
diff --git a/main/sysklogd/APKBUILD b/main/sysklogd/APKBUILD
index adf2f73ecff1..3e15a8444db4 100644
--- a/main/sysklogd/APKBUILD
+++ b/main/sysklogd/APKBUILD
_at_@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
 pkgname=sysklogd
 pkgver=1.5.1
-pkgrel=0
+pkgrel=1
 pkgdesc="System and kernel log daemons"
 url="http://www.infodrom.org/projects/sysklogd/"
 arch="all"
_at_@ -15,11 +15,11 @@ source="http://www.infodrom.org/projects/$pkgname/download/$pkgname-$pkgver.tar.
 	sysklogd.daily
 	sysklogd.initd
 	sysklogd.confd
-	sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
-	sysklogd-1.4.2-caen-owl-syslogd-bind.diff
-	sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+	sysklogd-1.4.2-caen-owl-klogd-drop-root.patch
+	sysklogd-1.4.2-caen-owl-syslogd-bind.patch
+	sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch
 	sysklogd-1.5-build.patch
-	ksym-fclose-fix.diff
+	ksym-fclose-fix.patch
 	fix-includes.patch
 	syslog.conf
 	LICENSE"
_at_@ -50,11 +50,11 @@ d82caedfa61bfefc0162e5c416ff75a5cd8f60abe1cf8a3c5c4e7775aeb7bb64e712c783031659d3
 87a95d612b9841a022c91a219ff4f69f57badb7f84178f06fc8abec242df948540582f27146b34c6ce730a451ddfc5195b24237cd70c70896ef040148789dd20  sysklogd.daily
 eb4c2c411d75315e113efe40c8445dd2eb7aa88e3318ce3d7624916005ec82325a877c83f5816231fc25d5103ac5be1fc58a4d9593b99fea24c87805abd03039  sysklogd.initd
 4553d85e93fb07e7d4a6ed0b47a3ea2044a5605adaac05223724c32a60bb8ae96d99ca95965c3931640beef234e976c1141b83f603aa8c6e8aca1dec20ca807c  sysklogd.confd
-1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a  sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
-995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d  sysklogd-1.4.2-caen-owl-syslogd-bind.diff
-87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852  sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
+1a5cf4a5dec3ecaa8258110820b64d6a8e1e768e841a3f0ade8d7827b91e73c2d8a49a9d8b74566373133627af88dd46d14e83ae1940a0b2e6cd6fe8710a7e7a  sysklogd-1.4.2-caen-owl-klogd-drop-root.patch
+995c240fc54681445f68f7681173e1e1860aaab309edc8ac3531881c63c8889f009a7fd622d37145e80fe187410b80c28554140d6a6660134ca87a1c8d13570d  sysklogd-1.4.2-caen-owl-syslogd-bind.patch
+87865e069f9c78990660cf29a37ba1ded7cc078ea8f05af63fc6068c470d1881181387477dccb830d96af05f352959181619380d61afccf3a11d213372e68852  sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch
 ab979b36f091c62ada916246723cd75a71319a6c3687c034167b9caafc53807e6d224e0d6c836bc4b81b61c1d02ec21a1cb19477396a416c62f097d4b9ccc678  sysklogd-1.5-build.patch
-ceb1f7cb70f526dd285fc8bad5511cdef603fc1296f69cc0e7ec4901f11685fae083d028687765b233ca074dfbe0cdafa921de6c80a5cbced94de1059d9761ee  ksym-fclose-fix.diff
+ceb1f7cb70f526dd285fc8bad5511cdef603fc1296f69cc0e7ec4901f11685fae083d028687765b233ca074dfbe0cdafa921de6c80a5cbced94de1059d9761ee  ksym-fclose-fix.patch
 0208662a0158ecb6b0a387bd1bf467c866105dac02767209aeaaaeb02762d6c2b814a2707315f8f6cd40f46c4b7744b74653e30973c31354998c27cd7c966dbd  fix-includes.patch
 49f73b8a16b92d0cda56db9cfc16d5322e797590dfc998282a62560d54205042af953837f5f94b45a3de403fdf5f63efe65d72e9908c7185a2cd5941275abf33  syslog.conf
 7b3de1d38b50df14ceaada900f2e8f23b0d5035278c9eacb06d2578ccdcf64ffc44bbb76ed6a10d80f4b883bf36a3ecd2bf60897321e4eae7aed7d8a5a36d86c  LICENSE"
diff --git a/main/sysklogd/ksym-fclose-fix.diff b/main/sysklogd/ksym-fclose-fix.patch
similarity index 100%
rename from main/sysklogd/ksym-fclose-fix.diff
rename to main/sysklogd/ksym-fclose-fix.patch
diff --git a/main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.patch
similarity index 100%
rename from main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-klogd-drop-root.patch
diff --git a/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.patch
similarity index 100%
rename from main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-bind.patch
diff --git a/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff b/main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch
similarity index 100%
rename from main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.diff
rename to main/sysklogd/sysklogd-1.4.2-caen-owl-syslogd-drop-root.patch
-- 
2.13.5
---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Thu Nov 23 2017 - 00:56:34 GMT