diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/openrc/0001-librc-fix-off-by-one-bug.patch | 29 | ||||
| -rw-r--r-- | main/openrc/APKBUILD | 18 | ||||
| -rw-r--r-- | main/openrc/rc-sys-lxc.patch | 39 |
3 files changed, 5 insertions, 81 deletions
diff --git a/main/openrc/0001-librc-fix-off-by-one-bug.patch b/main/openrc/0001-librc-fix-off-by-one-bug.patch deleted file mode 100644 index 96201eac45..0000000000 --- a/main/openrc/0001-librc-fix-off-by-one-bug.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 08cde40ee9abe9d3659133dfa9b10f609a13db20 Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Thu, 26 Sep 2013 07:58:12 +0000 -Subject: [PATCH] librc: fix off-by-one bug - -We need allocate space for both the added leading '-' and the trailing -'\0'. - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - src/librc/librc-depend.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c -index ac93716..c9df451 100644 ---- a/src/librc/librc-depend.c -+++ b/src/librc/librc-depend.c -@@ -856,7 +856,7 @@ rc_deptree_update(void) - * work for them. This doesn't stop them from being run directly. */ - if (sys) { - len = strlen(sys); -- nosys = xmalloc(len + 1); -+ nosys = xmalloc(len + 2); - nosys[0] = '-'; - for (i = 0; i < len; i++) - nosys[i + 1] = (char)tolower((unsigned char)sys[i]); --- -1.8.4 - diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 91ba3f1306..9fb9884ef3 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc -pkgver=0.11.8 +pkgver=0.12.4 _ver=${pkgver/_git*/} -pkgrel=2 +pkgrel=0 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -16,9 +16,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2 0001-Force-root-be-rw-before-localmount.patch swap-umount-tmpfs.patch swap-ifexists.patch - rc-sys-lxc.patch begin-end-decls.patch - 0001-librc-fix-off-by-one-bug.patch hostname.initd hwdrivers.initd @@ -65,14 +63,12 @@ package() { install -d "$pkgdir"/etc/local.d "$pkgdir"/run } -md5sums="d896371d533a22de4cf57c7371c4d6e8 openrc-0.11.8.tar.bz2 +md5sums="6c89372f4bbbcb351ec9ee0b3b5ac0bd openrc-0.12.4.tar.bz2 8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch 4fd036ff07ed9ad7fb76af6a3ffc0695 0001-Force-root-be-rw-before-localmount.patch c2af5e52da614a6cef02d1e4d537e360 swap-umount-tmpfs.patch 1c426b84d13a725ad493647b5253f239 swap-ifexists.patch -4a2ec4d9d988423fdafc332d2174ecdf rc-sys-lxc.patch 00c0d99a19915fac57a20e5995f57bdb begin-end-decls.patch -3114000416695ba499beffc03134b0fd 0001-librc-fix-off-by-one-bug.patch c32e15b0858eef708497e7ee6355a055 hostname.initd ce3832d8ed5906367ef0f4776b38f3bd hwdrivers.initd 33ca3e558c42cdd17adccbc7807298f7 keymaps.initd @@ -80,14 +76,12 @@ ce3832d8ed5906367ef0f4776b38f3bd hwdrivers.initd 8c9e46ea5898d375e709a82503f7e277 modloop.initd 55aeca82475cb5a146abff8333bfdf85 networking.initd c1ec888202d868710b5749f7b217d1e3 modloop.confd" -sha256sums="e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 openrc-0.11.8.tar.bz2 +sha256sums="c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c openrc-0.12.4.tar.bz2 c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1 openrc-0.4.3-mkmntdirs.patch e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-root-be-rw-before-localmount.patch 84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4 swap-umount-tmpfs.patch 8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c swap-ifexists.patch -0e527b58f4ba325a853fccb58e7fab99a31335eee59d01856e4d1f103db8c581 rc-sys-lxc.patch d3b20f5cb053ed24d7b76b75aeef98b9f2bc77401930fa934c9452fa634db18c begin-end-decls.patch -e39dfdf732139ab303f66dd4f49b3aaf18731d7b791ae2dd7af8c15e635b17f6 0001-librc-fix-off-by-one-bug.patch e91790d23135c43102ea73e5768d4b0d25e9a7d28fca90f1b902aac9c41e1d5c hostname.initd a71a38309beb6f4718a2ece863659735a5e157a7c927518265e562cd90fc71ff hwdrivers.initd a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f keymaps.initd @@ -95,14 +89,12 @@ a6f013c02ca3efb4e29b4844e4d27710cfd319e66157c4fd88a8169e06e7151f keymaps.initd 48b8c030ff9b9dc8929eb6e7271659d6d7ad297384886950781da7543a9601e1 modloop.initd dc30c4e0cac37597dda3f97f68aa2f8a5e87a9856de8b2fd08579916117de8ed networking.initd a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254 modloop.confd" -sha512sums="aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 openrc-0.11.8.tar.bz2 +sha512sums="14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 openrc-0.12.4.tar.bz2 eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db openrc-0.4.3-mkmntdirs.patch 51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7 0001-Force-root-be-rw-before-localmount.patch 8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542 swap-umount-tmpfs.patch c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1 swap-ifexists.patch -31dd91ed667b053766693943b31645c4236681b786108a1aa27f3acf86402feb273f2d66352a840e3afa10deb64b165edc4fe9f93ac9b58d3b45fc28222707b0 rc-sys-lxc.patch 92788e88c0da278f6673df90cd34f8204b8226305f7ee3e43e33566f1c7b8ff819bba954d82c14305f4174a76398abe7e029ee99e816cc94963a65d42ec89c92 begin-end-decls.patch -6c9493c25d16fcc603554898d89be02cddb8afe24451b592e07d3f64cf7fad67d9895f073aa8bd332ecfe3abc0766c68e3179d830d107fe596de0513ad2a15fb 0001-librc-fix-off-by-one-bug.patch 6de80fd9ff9692bb15aa0a90255beea939a4f79b4fdff9fdf443d85bf168c162183efa44d7769af855f9c2460c77f29df19037eca09156ac42dd01fba7be9934 hostname.initd 932669915d0e4c8b7d23823c6d057d5d3bbc7f2f67532547201fea986c7e3208607d69cfdd41b0b0b1828f33c4e87efb8d65f7a715c33a8c9cdc846b7ec7439b hwdrivers.initd ee58de9b8608d3f3aa6111b9b43977b91bd2c39bcc3471711812fe740dbc49eee8a7ddd6f2878b90c8eb9bcc5a2f543cb2d82c04f16c263ffad58de7955d8db5 keymaps.initd diff --git a/main/openrc/rc-sys-lxc.patch b/main/openrc/rc-sys-lxc.patch deleted file mode 100644 index c693245d37..0000000000 --- a/main/openrc/rc-sys-lxc.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/librc/librc.c b/src/librc/librc.c -index d82880f..40b975a 100644 ---- a/src/librc/librc.c -+++ b/src/librc/librc.c -@@ -168,7 +168,7 @@ file_regex(const char *file, const char *regex) - char *line = NULL; - size_t len = 0; - regex_t re; -- bool retval = false; -+ bool retval = true; - int result; - - if (!(fp = fopen(file, "r"))) -@@ -184,11 +184,21 @@ file_regex(const char *file, const char *regex) - } - - while ((rc_getline(&line, &len, fp))) { -- if (regexec(&re, line, 0, NULL, 0) == 0) -- retval = true; -- if (retval) -- break; -+ char *str = line; -+ /* some /proc files have \0 separated content so we have to -+ loop through the 'line' */ -+ do { -+ if (regexec(&re, str, 0, NULL, 0) == 0) -+ goto found; -+ str += strlen(str) + 1; -+ /* len is the size of allocated buffer and we don't -+ want call regexec BUFSIZE times. find next str */ -+ while (*str == '\0' && str < line + len) -+ str++; -+ } while (str < line + len); - } -+ retval = false; -+found: - fclose(fp); - free(line); - regfree(&re); |