summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-10-13 07:13:06 +0000
committerUlrich Müller <ulm@gentoo.org>2013-10-13 07:13:06 +0000
commitc5896e2c09db5cbd0655ee0d6b395d9f63aa094c (patch)
tree2ba48ae81f82a413505bd9a2a58633a245ae804d /app-editors
parentBackport fixes from -9999 to release, remove old (diff)
downloadhistorical-c5896e2c09db5cbd0655ee0d6b395d9f63aa094c.tar.gz
historical-c5896e2c09db5cbd0655ee0d6b395d9f63aa094c.tar.bz2
historical-c5896e2c09db5cbd0655ee0d6b395d9f63aa094c.zip
Fix dirname(3) call in writeout function, bug 487758.
Package-Manager: portage-2.2.7/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/mg/ChangeLog9
-rw-r--r--app-editors/mg/Manifest25
-rw-r--r--app-editors/mg/files/mg-20130922-dirname.patch20
-rw-r--r--app-editors/mg/mg-20130922-r1.ebuild (renamed from app-editors/mg/mg-20130922.ebuild)7
4 files changed, 46 insertions, 15 deletions
diff --git a/app-editors/mg/ChangeLog b/app-editors/mg/ChangeLog
index 52dc530e9a48..d5f9ebb33b45 100644
--- a/app-editors/mg/ChangeLog
+++ b/app-editors/mg/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for app-editors/mg
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.60 2013/10/09 10:06:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/ChangeLog,v 1.61 2013/10/13 07:12:45 ulm Exp $
+
+*mg-20130922-r1 (13 Oct 2013)
+
+ 13 Oct 2013; Ulrich Müller <ulm@gentoo.org> -mg-20130922.ebuild,
+ +mg-20130922-r1.ebuild, +files/mg-20130922-dirname.patch:
+ Fix dirname(3) call in writeout function, bug 487758. Thanks to Marien Zwart
+ <marienz@gentoo.org>.
09 Oct 2013; Ulrich Müller <ulm@gentoo.org> mg-20130922.ebuild:
Specify CPPFLAGS not CFLAGS for preprocessor options. Add missing EPREFIX.
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 6212e8c01444..8619aac52b8f 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,23 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX mg-20130922-dirname.patch 466 SHA256 10b951ccff77f3fff24a7fb8ec37055c91a6fbee13862c462eaa563adf7537c9 SHA512 a9b7cae1cd2c196d6577352bef167cd743ea0782c88cf0e959e1af2c64f87212219dbba114e5f896a41fe4b4a40e8f45a9cc0220dfcfcc7b5b48018d98a81df1 WHIRLPOOL fceb710c1dc540c702e18721ee58e11a57b66bbdf68b248323e52fdb7f3c2b2ea62a99fa5e8f98e2baeadc0b39437d89fe0aa6ce408378db534eda6313da6067
DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
DIST mg-20130922.tar.gz 142886 SHA256 323c21489416e256d036e8d58b6b72f96e7dee393fa8e38709f5fa226c8e7dd3 SHA512 79bf02ff3d30f41c234310b33c98f9a0f9c8a1197fe12c02e108071f6bc80f0d37003076cc1a2eb1c9a88c668eeab30e8a2d0c86af13ef57dd562dc077bb229b WHIRLPOOL c358095bf8fc686a5ebbe327ac35f5812164623307e77b1cc8293f28a65893dfd1826b4412ce0800cb5b77394b2eaeaff261149f25cd075651a7783c64248ff8
EBUILD mg-20110905-r1.ebuild 1219 SHA256 242469a115a7a3e9b8cad1aeeb430246f8a6fedfbe3b48f6502b3d61c6ee330e SHA512 93b4b738b468bc163f1ae5a617b4d8e76e55b83af697834cee539fdb864317b75627feb2fda55be0092d457dfb2e7e64cc630667086abef61b593dff04d69cb9 WHIRLPOOL b3ed099897c61d3b412a1f3d5105ce6b0e57ccf199d08b675e7256e72f79aa0fe3563e816e10d90afd1d0c88d0fea0bd644da3167e78a6e41fc7b543b17a9b71
-EBUILD mg-20130922.ebuild 1437 SHA256 faed1075661ed07cb66de9b80035a5a7535a05a427d84adc0b8fdbd89a2554b4 SHA512 9add07517ac650f748748eb833d988e1167952794602090d35a6a04365f9c643da8aa7ac4662293cdc29896ef9d865f2d9e03daf431a4265f81362be0850ed5e WHIRLPOOL dceea916116659b7a8be7fd25310258b349ad45b2c79a90674641984497f00c519fed0f128d03f067621256de9bd7464fdd7072ef01df0222f7518f670995c15
-MISC ChangeLog 7057 SHA256 a9c58ef9b243eed941fca2f868ecf59490f3c3a788ac2a50a852614d8d0d3d09 SHA512 6fc2eb6845e6282ff738e0fb6031ca721f7357c6bb3b8b6bd404c8fa8e993a5c5e60b75fa91eea0463f5f382dda9ff7252de7c4f04c561c2d2fbd20299d57556 WHIRLPOOL 4eeddfb04361ce75f035a25a8d81bdcb5ecebee0e0d7193e8bd81ba079c4f84a8c247959a819151a4b62e1cdd654e5ebc9cd1ae1f372e1f7b3369c54aa121f0f
+EBUILD mg-20130922-r1.ebuild 1502 SHA256 e5eca59381b343c212f33c9954c785fd247a099b6b3cbbce957adad72307c945 SHA512 cd7e3acb01dfc557b4420881910e81ed4fff67b85971e6e70e2a58eb3fe8bd312c6fa46ed7cdba29cc28fd15e7e6fe2f83c38d408f2fa082835259e96fb1ac5d WHIRLPOOL eb3b971f666a4c7d32f4ce72082030db83aeefd13d54ec7fcdd7d2f48233a184ecf7ee4755bf536ba6f397137fd656a45182f1518d64a13961646919150051ae
+MISC ChangeLog 7320 SHA256 726b89f0aa124de7f3bf39dd5e707ce88129884858d3870db5cd4664ed7b33ef SHA512 d070ee1de9e99ea005352fbed539e1a33e6001703afcaf2b2f1419bb688017688579c45296df54e3ca766fb5ed0c33272a16afcf9ebdc0ed39c1d0a617cea749 WHIRLPOOL a2f10b4adf386440f421c579c556b391bf5512dfde5cb096d025ff7086e94648822f5346d8f578f147d0bd194b4b63a3b35cb05c0e2fda16f08b0a19128fca4a
MISC metadata.xml 291 SHA256 65d24d4c0b435503345283db1c00cc7161174eddecc4d737cbf50d924145ca6c SHA512 2ba87a6af0cc36ed2e49ded86f81a6e30b2b9ca9e73949860db9f30bac95ad7374fe1e0c5e712f3c427a8a562ceb57c9693aea967f7c134d5858aca4ec704ba2 WHIRLPOOL 604f60f36640570753ef76af4f260e3103dc8cdfbb8dc00d585d864a6ce8fc3f573a95340720d00c9ebfccc817c13065419090aad6c281a96106b423bd88bd38
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQGcBAEBCAAGBQJSVSrmAAoJEJQzkH1pP7W4v3wMAI5IftdINTNyp2DFaCAjE2//
-8DaGypXwTchHkNOUAuQSSv3Q5NL1frZ9HtgI5DXdmz/w6iJ8CXupQX9sb0GDvh2a
-Mp0FztT2Gn79a/iUDmxBUJGWIIG3seJD2VXlR1Vmv49Bmn3BCV9/J/D/LhmIxvIg
-K8rkExKr5/uXIigDmXZGC7Qorrj8vfOGwV2Z6/vo+8bgnxXBoW5cVhjKWKxsOCXm
-8ISiYCV8UxXUZ2n+W82aVpBhTNVUhRImMlECaj0N3JFY9uz96qwLmmHuX1Mk+/be
-ljJdHIQeAs6CX1+DzBaZhHOQiTQdGoTzYxFfGP3jaHbo2GsexVFdzYpe87mHMXZ4
-aMWN9ByZcIjEH6E/6gigi3GzJkfg2oekUQrEMewh2x5Bxx1/SaBUDVS+x0heRsBl
-D3DjsU5s1QijdPT7tzrXvvx2GtCVwQcgeqjVlhcWg5nzv3HsW7fmIPEWJ1Pf5aru
-lQogXtUr00HJ/JKakEIj5Jf5sBu0ZEgCEatITQTUbQ==
-=GhRi
+iQGcBAEBCAAGBQJSWkg4AAoJEJQzkH1pP7W4oS8L/2m8PZj1vFV1nTRJW2WqxFGj
+YHTzvxiYdgvfMnXuNgCinysQ91QmpclcFlulXoIhk7R+IluPiF6+GY9pBXdvV64K
+DxfQoVtF7Jn0qBIHRhSzNGymha3gc9YH9edWy/gmVyt7/Qb9Gvhy7arjCzdLPBuW
+D5dPtz1vHq9dETkHtpRyofDO3mkNX+MHd5LxyyKApROOdTFUAq4AaF5Syh17hj97
+i4fUNI8DlWWC2kyZPgiZNBFiw7m+DPDmrTqXk6fbeIPXlGhWkKSuesFWQBk1k5el
+0F2FAkH+/iE2O5mUY0qweIYk4XYoA0SEV0n9JluQA/XyUsBgfhhrzui5D+TJNv1z
+c3XEEqzc1+d4ZzKI0uaHUq1PtyG6LGRMFt65H6IZtJAy1GvZHxgQPZpxpd8oGZC8
+3w3TZM/nLKCVrHbojTOif6Uld/Y8Ul4xMOqQElw4VplGI6462Bub3GWpgC1E4AFZ
+z7pdEFRgRfeQ5pmiHoFS8pP/lAi6N2X8TUNATVoV8w==
+=dgDO
-----END PGP SIGNATURE-----
diff --git a/app-editors/mg/files/mg-20130922-dirname.patch b/app-editors/mg/files/mg-20130922-dirname.patch
new file mode 100644
index 000000000000..c97958948bfe
--- /dev/null
+++ b/app-editors/mg/files/mg-20130922-dirname.patch
@@ -0,0 +1,20 @@
+Fix dirname(3) call in writeout function.
+https://bugs.gentoo.org/487758
+
+--- mg-20130922-orig/file.c
++++ mg-20130922/file.c
+@@ -669,11 +669,11 @@
+ {
+ struct stat statbuf;
+ int s;
+- char *dp;
+-
+- dp = dirname(fn);
++ char ts[NFILEN], *dp;
+
+ if (stat(fn, &statbuf) == -1 && errno == ENOENT) {
++ (void)strlcpy(ts, fn, NFILEN);
++ dp = dirname(ts);
+ errno = 0;
+ if (access(dp, W_OK) && errno == EACCES) {
+ ewprintf("Directory %s%s write-protected", dp,
diff --git a/app-editors/mg/mg-20130922.ebuild b/app-editors/mg/mg-20130922-r1.ebuild
index 368751e61d1b..2cee2c59dee9 100644
--- a/app-editors/mg/mg-20130922.ebuild
+++ b/app-editors/mg/mg-20130922-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20130922.ebuild,v 1.5 2013/10/09 10:06:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/mg/mg-20130922-r1.ebuild,v 1.1 2013/10/13 07:12:46 ulm Exp $
EAPI=5
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
HOMEPAGE="http://homepage.boetes.org/software/mg/"
@@ -21,6 +21,9 @@ DEPEND="${RDEPEND}
dev-libs/clens"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-dirname.patch
+ epatch_user
+
# create our own Makefile to avoid BSD make
echo -e 'SRCS =' *.c '\n\nmg: $(SRCS:.c=.o)' \
'\n\t$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)' >Makefile || die