diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-09-26 08:01:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-09-26 08:02:01 +0000 |
| commit | bf8eb6a17d6adf8c346744847209506a63bd0c4b (patch) | |
| tree | edc64574617641aa5dd32fd517f959f13f0c51f5 /main | |
| parent | 7ced03ba3dd23df7ee0f75de2f5f2d226806272a (diff) | |
| download | aports-bf8eb6a17d6adf8c346744847209506a63bd0c4b.tar.bz2 aports-bf8eb6a17d6adf8c346744847209506a63bd0c4b.tar.xz | |
main/openrc: fix an off-by-one bug
Diffstat (limited to 'main')
| -rw-r--r-- | main/openrc/0001-librc-fix-off-by-one-bug.patch | 29 | ||||
| -rw-r--r-- | main/openrc/APKBUILD | 6 |
2 files changed, 34 insertions, 1 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 new file mode 100644 index 0000000000..96201eac45 --- /dev/null +++ b/main/openrc/0001-librc-fix-off-by-one-bug.patch @@ -0,0 +1,29 @@ +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 1c161e3908..91ba3f1306 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.11.8 _ver=${pkgver/_git*/} -pkgrel=1 +pkgrel=2 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" arch="all" @@ -18,6 +18,7 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2 swap-ifexists.patch rc-sys-lxc.patch begin-end-decls.patch + 0001-librc-fix-off-by-one-bug.patch hostname.initd hwdrivers.initd @@ -71,6 +72,7 @@ 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 @@ -85,6 +87,7 @@ e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066 0001-Force-roo 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 @@ -99,6 +102,7 @@ eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5c 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 |