From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- x11-libs/libgksu/Manifest | 19 ++ x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch | 60 ++++ .../files/libgksu-2.0.12-automake-1.11.2.patch | 25 ++ .../libgksu-2.0.12-correct_colormap_get.patch | 12 + .../files/libgksu-2.0.12-desktop-validation.patch | 16 + .../files/libgksu-2.0.12-fix-make-3.82.patch | 21 ++ .../files/libgksu-2.0.12-format_security.patch | 28 ++ ...u-2.0.12-g_markup_escape_text_for_command.patch | 21 ++ .../files/libgksu-2.0.12-missing-libs.patch | 22 ++ .../libgksu/files/libgksu-2.0.12-notests.patch | 26 ++ .../files/libgksu-2.0.12-revert-forkpty.patch | 359 +++++++++++++++++++++ .../files/libgksu-2.0.12-sudo_keep_env.patch | 15 + x11-libs/libgksu/files/libgksu-2.0.7-libs.patch | 76 +++++ .../libgksu/files/libgksu-2.0.7-polinguas.patch | 40 +++ x11-libs/libgksu/libgksu-2.0.12-r2.ebuild | 68 ++++ x11-libs/libgksu/libgksu-2.0.12-r3.ebuild | 81 +++++ x11-libs/libgksu/metadata.xml | 8 + 17 files changed, 897 insertions(+) create mode 100644 x11-libs/libgksu/Manifest create mode 100644 x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-notests.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.7-libs.patch create mode 100644 x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch create mode 100644 x11-libs/libgksu/libgksu-2.0.12-r2.ebuild create mode 100644 x11-libs/libgksu/libgksu-2.0.12-r3.ebuild create mode 100644 x11-libs/libgksu/metadata.xml (limited to 'x11-libs/libgksu') diff --git a/x11-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest new file mode 100644 index 000000000000..4c3205637e87 --- /dev/null +++ b/x11-libs/libgksu/Manifest @@ -0,0 +1,19 @@ +AUX libgksu-2.0.0-fbsd.patch 2847 SHA256 bf0343df8e316ac227da7c40a889dd5128da081a640c187dfb743b4f213c3792 SHA512 8c99781e617b7fa96d9ff019a42b362c18f107bf335fbd591c23ac49d9f8ab4ee15a633968a60ba3ae92fe2004f4cdbd4d69b7f7c60c8d5abbd3db90c632c9be WHIRLPOOL af0fcaa2f4ddc58bd8d9483dc0f9b0e2b41e21f3e3ebe51515da763cc41de38d7211670df295a23c455050596c774cbbac050e6c364b5a8cd3dc3e4af56ff9e6 +AUX libgksu-2.0.12-automake-1.11.2.patch 836 SHA256 8d6573025758e5f5c569963fab2d99f406ea50fb055bf06693868ba976c5dd66 SHA512 f4509984cfcd2de42a786cd111c980a985fac21956042a4d68431503f5d2f7fb28850052d876545be538a8bdeaf7a0cd9f7df823ee3011149c6f819e612fec8e WHIRLPOOL 11b63176e89745af4425b081c3bc5c5cbd9f5337201e8519fe8f0b40c2689af5b1b47cdcd4fab4c5df9b26c9134cb5be94611bad515c161f5b90370e74319c4a +AUX libgksu-2.0.12-correct_colormap_get.patch 507 SHA256 ff1d3802457b3dcdd20aa89b79c383c8aeb52e5aac040d13a607d46198fb6882 SHA512 14da334403bcd48bf0e697eba115e2533cb0dd188ea69535d24401a71e40004c474f0c889d3b1096e2d47880fab9b12bd6c814abbb0bfed80275825f05912bbf WHIRLPOOL 167fce8b7b34e70b8c64b6418317bd4c8603e4ca3071f1b1c6a6850eb22fed20f77a0be928412713df652ba0d0995c028beb19946411ca3acbb5831f7f85b990 +AUX libgksu-2.0.12-desktop-validation.patch 507 SHA256 a053cbde2cbd069e1f820963c97e7f4da821b4d307e8fcd9bcefbebcd0dfe854 SHA512 768a6ce966eec9f55f70e87122d557fe861545b120c990835386e17e24b2f3ebab744d5bb945fadb92513f70920cfbb4de6060f76f1a0cdf2e08fbe52cb327a7 WHIRLPOOL a611a75a8ce6569e1254344b846b95247e85427101529f35ac39fe0eea89debe9e2d7b30c71442f323dffdf009425ca1bae3023bd51e74a480abcf469616dd81 +AUX libgksu-2.0.12-fix-make-3.82.patch 670 SHA256 2090fa01935a64a8e9c39b99adea462db26a07d8b2a83a0ea13c8435bd199392 SHA512 2711ea9d67ba327c28049a0ec260d3b15a5f3fbc327f242943c3ce0519575d92db64bbf3f33271260d276092f7d717048aa82d9824d620d32b94370036b2548a WHIRLPOOL 82cc077c01cc9c041637f50dd3da86875048702511cdcc6635f6e26ddec22a8559c969769395fcfb7c1563c764ac7506754e06a45785dcc160726780ff7be1fe +AUX libgksu-2.0.12-format_security.patch 1019 SHA256 5e892b5f3610bcf79655a5768bced19102b04b272570cd886092599b84e85c56 SHA512 3d6772a1fb2ea9f2efa90e229151236a192aabb43980532e8dfe16d811be40ce054ebd7ed3c0a8451a0ba93e21dadc09de8bbfecfb2d71e062d964693f4d8853 WHIRLPOOL 3c8ef644886ac2954534b41e1b4ee958df5155571374ba0aa89e4b0f3a692d2373b5b834bff5d8640d72658899d87f0b01a1e6c5d2295920f81a4bbc6cd704d3 +AUX libgksu-2.0.12-g_markup_escape_text_for_command.patch 575 SHA256 5c8392de9815365cd74c71bea589845e8fa6b05f1cbb0d924c220e9c5c4d0fc7 SHA512 e881a34642659874480eb91e1d5e48effa4affa36357b67b83c3dacaa7f05fc3c2e1cd4d9363530eecaf88f63a9677cc413679d4bc342d981f9bd955299c97a0 WHIRLPOOL 20e791e3624c2022cd05c72e0f4a1865647d7d367fb9ceac15c1bee8b44ccb47ec219c0208de3f0728d78519b80a0297a254457c0a234f72106feead8416d72f +AUX libgksu-2.0.12-missing-libs.patch 728 SHA256 2368951c23451cd7dac9a6e679debfe7b1bb601ffbf04194c2e6092501793c32 SHA512 c1478771c77708d9828b0aeb26dfedafd5b5e20de4e2e778d60375dde1b343e707e50c704ec367ce00b01bcb295b8d253e52b615692a6b5a68c7cbeabfb1f3fb WHIRLPOOL 6c55a9849d090e9db4cd1051eda32d6373da8bb38e0a7431e10e28a7c1133a7e7a04ba6f8a9cef7c410560edb8d4f336d2d50695a66a5f107cbf9df62434d928 +AUX libgksu-2.0.12-notests.patch 1060 SHA256 6cac450d0e3d8950c25fec078cc41478138fd14afe3492e96f7b889178725707 SHA512 359f009101e7d12cf2c4be2d03eb7a65944231941ae49813be84ad1609db843c31f8e28f0efe739831b33a1f287c2800d651adf299f36a7bdf7498119eebb19e WHIRLPOOL 6214f3d9158ce66a7b6454aa8068723e2abaf6970803774081abd488b8f3f4eb2c11f5fa6ad04012fdedafda70e2428a524a916d1116e03bd5b8fa76a0a7a873 +AUX libgksu-2.0.12-revert-forkpty.patch 11018 SHA256 e75597115bdc7c30ee223d73f5c071d7cceffd04fbf2798d1aa17920fae865dd SHA512 1e4572774c28a8c9e48b790df80553b5222dfbe04dd52062d9e16687c826aeb59a67c813327fae1ed1daa3e820258b59ed0bcb54223eeb05552c8a753bc707e7 WHIRLPOOL 57e2ccadd3903b71b5e4541f88e2bf42f5d69532e02df686985e1ef0a5ea920353e778c54fb89b035a20c132aac87a101d0c0e4fc7493be65b8ff88c1516979f +AUX libgksu-2.0.12-sudo_keep_env.patch 347 SHA256 8f8288b50dbd01f36b22576cc34477e6545d92841f0cb15fff89ef6b82500d13 SHA512 ed4d4a2458b5a9afc11c6e3ecb02df43df97bd2fcb920ab79cbacccf5acccbd07fbe8a34212386b1a8331d9b788bb5ef0425da98c85a384f488ee9c128dbca67 WHIRLPOOL 48bd3b5c73ecc99a22febad374ccbc014c8099371969c37e8a264ecb18e60364f3c7c310a57168d365371f2c9de0775ec83f4e1a2e45c2e62af50f32b36d605f +AUX libgksu-2.0.7-libs.patch 3129 SHA256 62d1d576bd8e4b07494a788d6760463ee2090e341dae5113d5f763a3549f6b6a SHA512 9c68a54d2f7cb3eb30d070a6946f9416fdf2e2690705f42289608d926aab3cd0742dd3510c262dcbe1b5d81d579f671770107f24366126adace085df2ba54b48 WHIRLPOOL 817d91559d1aaee88e2d4000420c7d2af7933fc7ae91d477eaadf0c8bdb3a0f793f11420fbfb9745891b0ccd6acbb4b4ae0bbb83017e311d7ead01fc0c7cba51 +AUX libgksu-2.0.7-polinguas.patch 749 SHA256 40ce03bebca2f06d09bda31418c331ed19c4f438bb30fe8c7afdafbbc6e38243 SHA512 9a9488703e28ce048ec1a5844ec386ba969d702e499e70342af44cbdc881ead450d182c0c270a54be42cc4ec7f35f66904a94f221a7446280b8bfe7b3b138103 WHIRLPOOL ae30db223c67d24b71c6e832a9039d9e5af7b67ebbb329d68339fc9525058323706e4a7da690d7ddfa6e60837e1ace262507c2f3b87d861450198b5574876149 +DIST libgksu-2.0.12.tar.gz 477903 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 WHIRLPOOL 429808802e740880c786c00f2abfaab564178c1da06be5023f1ee17aa766e10d61c3d3aad14affee834c928822a2b92cfac7e5fa2b326725497cdaa1334fb55d +EBUILD libgksu-2.0.12-r2.ebuild 1669 SHA256 a39aded9f3ebe599c05ee9f836e44f2e3c8b40621996b89c957c115809d7785a SHA512 8832abf4ecc74673e01eb080bd5dfe4ba39d091964706a90de2de7a16ff7d979d152bd1839be034162cac7036cd2101c63ec233894ea49d0f43cd97262c80d17 WHIRLPOOL a07f4ec0cf52440c561bf85347fa09c69b66457b16de24b42b51ccae362f70ae2678e40f2a7c6634c9a22e7a1586bfa171caee9b954a3c23b07e7ab381567f78 +EBUILD libgksu-2.0.12-r3.ebuild 2037 SHA256 94d7a4c8fbef9a26ec850975055e1b00de3a4b0fb276bfcf7a1f5ed2b23fc4ac SHA512 099ca10aeea726322646855dc239cec6d4e4d53eae29ee810295aad650acf7120273777f38a1fb070a5bf628c539e3ee116b1e603f1d42b7f4d7c49cbef86b00 WHIRLPOOL 1a45efdb7ad85826788b4538433fc3cbf347576dbf593f45decd74ca643e8c4846438245732d1876d9dd552bdbd2ec6cb7fcc9c42b390580fad83c10441989d1 +MISC ChangeLog 2720 SHA256 08143a4e10dc026289dbb9855b2a0b812c4994faad896b2bd4f78f2177688629 SHA512 94e45024ff626a09d9331889c0018e0d4947a1c303c1eb3561fcc1869d1330f426d0055c6ddc9d76efc30b2f1196a127ac3f50ed8927155a6de8e53e3d72ed13 WHIRLPOOL 81c43a054698fc449ff65ab3f2c6234e07ec4d22a7ee4cabfb5d78a5d25deaa4fcb64294ebd99c31269db07c4e8dcd6d1261a2b6065efaf94cb6b98c4c3fea6c +MISC ChangeLog-2015 13147 SHA256 806fe0e7443b32a466471d917c8b17adbd9b060450acde2faa0960b029982592 SHA512 d1959050a7bb41352e0e71efe9c60cc6cadc3dd662a412e5edb3e6667df0b5ca631b868fc960a82ddc40b9e0dcaafe065abd6e50ecded96daeac6b5ef23b6ab4 WHIRLPOOL 6b750cd3c7622ef8c3f30af6d5685f2b4061240e439f0bd4c47a15764e734d28c7a114f8cebd96b3855bb40ce4bc43e728910e60769b7ca5037a3bf6490062f6 +MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92 diff --git a/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch new file mode 100644 index 000000000000..5c007be5b4b4 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch @@ -0,0 +1,60 @@ +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c +--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 ++++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 +@@ -23,7 +23,12 @@ + #include + #include + #include ++#ifdef __FreeBSD__ ++#include ++#include ++#else + #include ++#endif + #include + #include + #include +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am +--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + + EXTRA_DIST = libgksu.ver +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in +--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 +@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- + gksu_run_helper_SOURCES = gksu-run-helper.c + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + EXTRA_DIST = libgksu.ver + all: all-am + +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am +--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 +@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` +diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in +--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 ++++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 +@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` ++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` + all: all-am + + .SUFFIXES: diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch new file mode 100644 index 000000000000..0f22166fb8b7 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch @@ -0,0 +1,25 @@ +Due to the following change, pkglib_PROGRAMS is invalid: + http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf + +https://savannah.nongnu.org/bugs/index.php?35241 +https://bugs.gentoo.org/show_bug.cgi?id=397411 + +--- + libgksu/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am +index 49362f9..3cb1090 100644 +--- a/libgksu/Makefile.am ++++ b/libgksu/Makefile.am +@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} + pkgconfigdir = ${libdir}/pkgconfig + pkgconfig_DATA = libgksu2.pc + +-pkglibdir = ${libdir}/${PACKAGE} +-pkglib_PROGRAMS = gksu-run-helper ++gksulibdir = ${libdir}/${PACKAGE} ++gksulib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch new file mode 100644 index 000000000000..5c34cae56136 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-correct_colormap_get.patch @@ -0,0 +1,12 @@ +=== modified file 'libgksu/libgksu.c' +--- a/libgksu/libgksu.c ++++ b/libgksu/libgksu.c +@@ -426,7 +426,7 @@ + attr.height = fadeout->area.height; + attr.wclass = GDK_INPUT_OUTPUT; + attr.visual = gdk_screen_get_system_visual (fadeout->screen); +- attr.colormap = gdk_screen_get_default_colormap (fadeout->screen); ++ attr.colormap = gdk_screen_get_system_colormap (fadeout->screen); + attr.override_redirect = TRUE; + attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR; + diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch new file mode 100644 index 000000000000..15de910474b6 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-desktop-validation.patch @@ -0,0 +1,16 @@ +Fix validation + +--- a/gksu-properties/gksu-properties.desktop.in 2017-09-03 16:41:57.872594752 +0200 ++++ b/gksu-properties/gksu-properties.desktop.in 2017-09-03 16:44:40.835919489 +0200 +@@ -3,9 +3,9 @@ + _Name=Privilege granting + _Comment=Configure behavior of the privilege-granting tool + Exec=gksu-properties +-Icon=gksu.png ++Icon=gksu + StartupNotify=true + Terminal=false + Type=Application +-Categories=GNOME;GTK;Application;Settings;AdvancedSettings; ++Categories=GNOME;GTK;Settings; + OnlyShowIn=GNOME;XFCE; diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch new file mode 100644 index 000000000000..05ff3e0b0ad0 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch @@ -0,0 +1,21 @@ +Fix indentation of Makefile.am + +--- a/Makefile.am 2010-08-22 16:11:19.872577459 -0500 ++++ b/Makefile.am 2010-08-22 16:11:55.289599110 -0500 +@@ -17,11 +17,11 @@ + + if GCONF_SCHEMAS_INSTALL + install-data-local: +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ +- done \ +- fi ++ if test -z "$(DESTDIR)" ; then \ ++ for p in $(schemas_DATA) ; do \ ++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ ++ done \ ++ fi + else + install-data-local: + endif diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch new file mode 100644 index 000000000000..d39bbafd67a3 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-format_security.patch @@ -0,0 +1,28 @@ +Description: Fix build failure with [-Werror=format-security] +Author: Michael Biebl +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643423 + +Let chunk stripped due to Gentoo revert-forkpty patch. + +Index: libgksu-2.0.13~pre1/libgksu/libgksu.c +=================================================================== +--- libgksu-2.0.13~pre1.orig/libgksu/libgksu.c 2011-12-07 11:01:18.351654566 +0100 ++++ libgksu-2.0.13~pre1/libgksu/libgksu.c 2011-12-07 11:01:41.231654725 +0100 +@@ -1276,7 +1276,7 @@ + context->dir = g_strdup (mkdtemp(template)); + if (!context->dir) + { +- fprintf (stderr, strerror(errno)); ++ fprintf (stderr, "%s", strerror(errno)); + return FALSE; + } + +@@ -2247,7 +2247,7 @@ + " %s"), converted_str, "gksu: waiting"); + g_free (converted_str); + +- g_set_error (error, gksu_quark, GKSU_ERROR_HELPER, emsg); ++ g_set_error_literal (error, gksu_quark, GKSU_ERROR_HELPER, emsg); + g_free (emsg); + + if (context->debug) diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch new file mode 100644 index 000000000000..de3ab6806eee --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-g_markup_escape_text_for_command.patch @@ -0,0 +1,21 @@ +Escape text for display in password prompt. + +From the Debian patch stack. + +--- a/libgksu/libgksu.c ++++ b/libgksu/libgksu.c +@@ -994,12 +994,12 @@ + "The application '%s' lets you " + "modify essential parts of your " + "system."), +- command); ++ g_markup_escape_text(command, -1)); + else + msg = g_strdup_printf (_("Enter your password to run " + "the application '%s' as user %s" + ""), +- command, context->user); ++ g_markup_escape_text(command, -1), context->user); + } + else + { diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch new file mode 100644 index 000000000000..955f455b9f8a --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-missing-libs.patch @@ -0,0 +1,22 @@ +Add missing libs to relevant targets + +--- a/configure.ac 2017-09-03 17:10:57.552216900 +0200 ++++ b/configure.ac 2017-09-03 17:16:39.674036975 +0200 +@@ -4,7 +4,7 @@ + AC_PREREQ(2.57) + + AC_INIT(libgksu, 2.0.12, kov@debian.org) +-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_SRCDIR(libgksu/libgksu.c) + AC_CONFIG_HEADERS(config.h) + +@@ -44,7 +44,7 @@ + PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.12, gconf-2.0]) + + PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) +-PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0 x11]) + + # Checks for library functions. + ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl th zh_CN" diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch new file mode 100644 index 000000000000..3787ef6bfc13 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch @@ -0,0 +1,26 @@ +Index: libgksu-2.0.12/libgksu/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksu/Makefile.am ++++ libgksu-2.0.12/libgksu/Makefile.am +@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper + gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` + gksu_run_helper_SOURCES = gksu-run-helper.c + +-noinst_PROGRAMS = test-gksu ++EXTRA_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c + test_gksu_LDADD = libgksu2.la + test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` +Index: libgksu-2.0.12/libgksuui/Makefile.am +=================================================================== +--- libgksu-2.0.12.orig/libgksuui/Makefile.am ++++ libgksu-2.0.12/libgksuui/Makefile.am +@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + +-noinst_PROGRAMS = test-gksuui ++EXTRA_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c + test_gksuui_LDADD = libgksuui1.0.la + test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch new file mode 100644 index 000000000000..2c3a8cc786bb --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch @@ -0,0 +1,359 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c +--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 ++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 +@@ -1,7 +1,6 @@ + /* + * Gksu -- a library providing access to su functionality + * Copyright (C) 2004-2009 Gustavo Noronha Silva +- * Portions Copyright (C) 2009 VMware, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -56,9 +55,6 @@ + static void + gksu_context_launch_complete (GksuContext *context); + +-static void +-read_line (int fd, gchar *buffer, int n); +- + GType + gksu_error_get_type (void) + { +@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, + for (i = 0 ; cmd[i] != NULL ; i++) + g_free (cmd[i]); + g_free(cmd); +- +- _exit(1); + } + else if (pid == -1) + { +@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, + /* drop the \n echoed on password entry if su did request + a password */ + if (password_needed) +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); +- read_line (fdpty, buf, 255); ++ read (fdpty, buf, 255); + if (context->debug) + fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); + } +@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, + { + int retval = 0; + +- /* Red Hat's su shows the full path to su in its error messages. */ +- if (!strncmp (buf, "su:", 3) || +- !strncmp (buf, "/bin/su:", 7)) ++ if (!strncmp (buf, "su", 2)) + { + gchar **strings; + +@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, + } + + strings = g_strsplit (buf, ":", 2); +- +- /* Red Hat and Fedora use 'incorrect password'. */ +- if (strings[1] && +- (g_str_has_prefix(strings[1], " Authentication failure") || +- g_str_has_prefix(strings[1], " incorrect password"))) ++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) + { + if (used_gnome_keyring) + g_set_error (error, gksu_quark, +@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, + { + char **cmd; + char buffer[256] = {0}; +- char *child_stderr = NULL; +- /* This command is used to gain a token */ +- char *const verifycmd[] = +- { +- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL +- }; + int argcount = 8; + int i, j; + +@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, + + pid_t pid; + int status; +- FILE *fdfile = NULL; +- int fdpty = -1; ++ FILE *infile, *outfile; ++ int parent_pipe[2]; /* For talking to the parent */ ++ int child_pipe[2]; /* For talking to the child */ + + context->sudo_mode = TRUE; + +@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, + cmd[argcount] = g_strdup("-S"); + argcount++; + +- /* Make sudo noninteractive (we should already have a token) */ +- cmd[argcount] = g_strdup("-n"); +- argcount++; +- + /* Make sudo use next arg as prompt */ + cmd[argcount] = g_strdup("-p"); + argcount++; +@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); + } + +- pid = forkpty(&fdpty, NULL, NULL, NULL); +- if (pid == 0) ++ if ((pipe(parent_pipe)) == -1) + { +- // Child +- setsid(); // make us session leader +- +- execv(verifycmd[0], verifycmd); ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, +- _("Failed to exec new process: %s"), ++ if ((pipe(child_pipe)) == -1) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error creating pipe: %s"), + strerror(errno)); + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } +- else if (pid == -1) ++ ++ pid = fork(); ++ if (pid == -1) + { + g_set_error (error, gksu_quark, GKSU_ERROR_FORK, + _("Failed to fork new process: %s"), +@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, + sudo_reset_xauth (context, xauth, xauth_env); + return FALSE; + } ++ else if (pid == 0) ++ { ++ // Child ++ setsid(); // make us session leader ++ close(child_pipe[1]); ++ dup2(child_pipe[0], STDIN_FILENO); ++ dup2(parent_pipe[1], STDERR_FILENO); + ++ execv(cmd[0], cmd); ++ ++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, ++ _("Failed to exec new process: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + else + { + gint counter = 0; + gchar *cmdline = NULL; +- struct termios tio; + + // Parent +- fdfile = fdopen(fdpty, "w+"); ++ close(parent_pipe[1]); + +- /* make sure we notice that ECHO is turned off, if it gets +- turned off */ +- tcgetattr (fdpty, &tio); +- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) +- { +- usleep (1000); +- tcgetattr (fdpty, &tio); +- } ++ infile = fdopen(parent_pipe[0], "r"); ++ if (!infile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } + +- fcntl (fdpty, F_SETFL, O_NONBLOCK); ++ outfile = fdopen(child_pipe[1], "w"); ++ if (!outfile) ++ { ++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, ++ _("Error opening pipe: %s"), ++ strerror(errno)); ++ sudo_reset_xauth (context, xauth, xauth_env); ++ return FALSE; ++ } ++ ++ /* ++ we are expecting to receive a GNOME_SUDO_PASS ++ if we don't there are two possibilities: an error ++ or a password is not needed ++ */ ++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); + + { /* no matter if we can read, since we're using + O_NONBLOCK; this is just to avoid the prompt +@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, + struct timeval tv; + + FD_ZERO(&rfds); +- FD_SET(fdpty, &rfds); ++ FD_SET(parent_pipe[0], &rfds); + tv.tv_sec = 1; + tv.tv_usec = 0; + +- select (fdpty + 1, &rfds, NULL, NULL, &tv); ++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); + } + + /* Try hard to find the prompt; it may happen that we're +@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, + if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) + break; + +- read_line (fdpty, buffer, 256); ++ read_line (parent_pipe[0], buffer, 256); + + if (context->debug) + fprintf (stderr, "buffer: -%s-\n", buffer); +@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, + + usleep (1000); + +- write (fdpty, password, strlen(password) + 1); +- write (fdpty, "\n", 1); ++ fprintf (outfile, "%s\n", password); ++ fclose (outfile); + + nullify_password (password); + +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ /* turn NONBLOCK off */ ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + /* ignore the first newline that comes right after sudo receives + the password */ +- fgets (buffer, 255, fdfile); +- /* this is the status we are interested in */ +- fgets (buffer, 255, fdfile); ++ fgets (buffer, 255, infile); ++ /* this is the status we are interessted in */ ++ fgets (buffer, 255, infile); + } + else + { +@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); + + /* turn NONBLOCK off, also if have no prompt */ +- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); ++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); + + should_display = gconf_client_get_bool (context->gconf_client, + BASE_PATH "display-no-pass-info", NULL); +@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, + fprintf (stderr, "%s", buffer); + } + +- if (g_str_has_prefix (buffer, "Sorry, try again.")) ++ if (!strcmp (buffer, "Sorry, try again.\n")) + g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, + _("Wrong password.")); ++ else if (!strncmp (buffer, "Sorry, user ", 12)) ++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, ++ _("The underlying authorization mechanism (sudo) " ++ "does not allow you to run this program. Contact " ++ "the system administrator.")); + else + { + gchar *haystack = buffer; +@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- /* If we have an error, let's just stop sudo right there. */ +- if (error) +- close(fdpty); +- + cmdline = g_strdup("sudo"); + /* wait for the child process to end or become something other + than sudo */ +@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, + if (context->sn_context) + gksu_context_launch_complete (context); + ++ while (read (parent_pipe[0], buffer, 255) > 0) ++ { ++ fprintf (stderr, "%s", buffer); ++ bzero(buffer, 256); ++ } ++ + /* if the process is still active waitpid() on it */ + if (pid_exited != pid) + waitpid(pid, &status, 0); + sudo_reset_xauth (context, xauth, xauth_env); + +- /* +- * Did token acquisition succeed? If so, spawn sudo in +- * non-interactive mode. It should either succeed or die +- * immediately if you're not allowed to run the command. +- */ +- if (WEXITSTATUS(status) == 0) +- { +- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, +- NULL, &child_stderr, &status, +- error); +- } +- + if (exit_status) + { + if (WIFEXITED(status)) { +@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, + + if (WEXITSTATUS(status)) + { +- if (g_str_has_prefix(child_stderr, "Sorry, user ")) +- { +- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, +- _("The underlying authorization mechanism (sudo) " +- "does not allow you to run this program. Contact " +- "the system administrator.")); +- } + if(cmdline) + { + /* sudo already exec()ed something else, don't report +@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, + if (!g_str_has_suffix (cmdline, "sudo")) + { + g_free (cmdline); +- g_free (child_stderr); + return FALSE; + } + g_free (cmdline); +@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, + } + } + +- fprintf(stderr, child_stderr); +- g_free(child_stderr); +- + /* if error is set we have found an error condition */ +- return (error == NULL); ++ if (error) ++ return FALSE; ++ ++ return TRUE; + } + + /** diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch new file mode 100644 index 000000000000..a51a1623debb --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.12-sudo_keep_env.patch @@ -0,0 +1,15 @@ +--- a/libgksu/libgksu.c ++++ b/libgksu/libgksu.c +@@ -2704,6 +2704,12 @@ + cmd[argcount] = g_strdup("-H"); + argcount++; + } ++ else ++ { ++ /* Preserve the environment, if sudo will let us */ ++ cmd[argcount] = g_strdup("-E"); ++ argcount++; ++ } + + /* Make sudo read from stdin */ + cmd[argcount] = g_strdup("-S"); diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch new file mode 100644 index 000000000000..b9fb77f27147 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch @@ -0,0 +1,76 @@ +# https://savannah.nongnu.org/bugs/?25362 +# https://bugs.gentoo.org/show_bug.cgi?id=226837 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 ++++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 +@@ -43,6 +43,9 @@ + PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) + PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) + ++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) ++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) ++ + # Checks for library functions. + ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" + +diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am +--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 +@@ -3,7 +3,7 @@ + AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" + + bin_PROGRAMS = gksu-properties +-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} ++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} + gksu_properties_SOURCES = gksu-properties.c + + gladedir = ${prefix}/share/${PACKAGE} +diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am +--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 +@@ -8,8 +8,8 @@ + # major -> breaks backward compatibility (changes to existing ABI) + # minor -> keeps compatibility (additions to the API) + # micro -> no change to the API/ABI +-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la +-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} ++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 + if USE_VERSION_SCRIPT + libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver + endif +@@ -24,12 +24,11 @@ + + pkglibdir = ${libdir}/${PACKAGE} + pkglib_PROGRAMS = gksu-run-helper +-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` ++gksu_run_helper_LDADD = ${GLIB_LIBS} + gksu_run_helper_SOURCES = gksu-run-helper.c + + noinst_PROGRAMS = test-gksu + test_gksu_SOURCES = test-gksu.c +-test_gksu_LDADD = libgksu2.la +-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} + + EXTRA_DIST = libgksu.ver +diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am +--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 ++++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 +@@ -4,12 +4,13 @@ + + noinst_LTLIBRARIES = libgksuui1.0.la + libgksuui1_0_la_SOURCES = gksuui-dialog.c +-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` ++libgksuui1_0_la_LDFLAGS = -Wl,-O1 ++libgksuui1_0_la_LIBADD = ${GTK_LIBS} + + noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h + includedir = ${prefix}/include/$(PACKAGE) + + noinst_PROGRAMS = test-gksuui + test_gksuui_SOURCES = test-gksuui.c +-test_gksuui_LDADD = libgksuui1.0.la +-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` ++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} ++ diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch new file mode 100644 index 000000000000..753862955716 --- /dev/null +++ b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch @@ -0,0 +1,40 @@ +# https://savannah.nongnu.org/bugs/?25360 +diff -Nura a/configure.ac b/configure.ac +--- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 ++++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 +@@ -50,7 +50,7 @@ + GETTEXT_PACKAGE=AC_PACKAGE_NAME + AC_SUBST(GETTEXT_PACKAGE) + +-IT_PROG_INTLTOOL ++IT_PROG_INTLTOOL([0.35.5]) + AM_GLIB_GNU_GETTEXT + + ################################################## +diff -Nura a/po/LINGUAS b/po/LINGUAS +--- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 ++++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 +@@ -0,0 +1,23 @@ ++# please keep this list sorted alphabetically ++# https://wiki.gnome.org/Initiatives/GnomeGoals/PoLinguas ++# ++ca ++cs ++da ++de ++es ++eu ++fr ++hu ++it ++ko ++lt ++pl ++pt_BR ++ro ++ru ++sk ++sv ++nb ++nl ++zh_CN diff --git a/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild new file mode 100644 index 000000000000..6b6d834d95c2 --- /dev/null +++ b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" +GCONF_DEBUG="no" + +inherit autotools eutils gnome2 + +DESCRIPTION="A library for integration of su into applications" +HOMEPAGE="http://www.nongnu.org/gksu/" +SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" +IUSE="nls static-libs" + +COMMON_DEPEND=" + >=x11-libs/gtk+-2.12:2 + >=gnome-base/gconf-2 + gnome-base/libgnome-keyring + x11-libs/startup-notification + >=gnome-base/libgtop-2:2= + nls? ( >=sys-devel/gettext-0.14.1 ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo +" + +src_prepare() { + # Fix compilation on bsd + epatch "${FILESDIR}"/${PN}-2.0.0-fbsd.patch + + # Fix wrong usage of LDFLAGS, bug #226837 + epatch "${FILESDIR}/${PN}-2.0.7-libs.patch" + + # Use po/LINGUAS + epatch "${FILESDIR}/${PN}-2.0.7-polinguas.patch" + + # Don't forkpty; bug #298289 + epatch "${FILESDIR}/${P}-revert-forkpty.patch" + + # Make this gmake-3.82 compliant, bug #333961 + epatch "${FILESDIR}/${P}-fix-make-3.82.patch" + + # Do not build test programs that are never executed; also fixes bug + # #367397 (underlinking issues). + epatch "${FILESDIR}/${P}-notests.patch" + + # Fix automake-1.11.2 compatibility, bug #397411 + epatch "${FILESDIR}/${P}-automake-1.11.2.patch" + + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026 + + eautoreconf + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable nls) \ + $(use_enable static-libs static) +} diff --git a/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild new file mode 100644 index 000000000000..0568909e0b6d --- /dev/null +++ b/x11-libs/libgksu/libgksu-2.0.12-r3.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_EAUTORECONF="yes" + +inherit gnome2 + +DESCRIPTION="A library for integration of su into applications" +HOMEPAGE="http://www.nongnu.org/gksu/" +SRC_URI="https://people.debian.org/~kov/gksu/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="nls static-libs" + +COMMON_DEPEND=" + >=x11-libs/gtk+-2.12:2 + x11-libs/libX11 + >=gnome-base/gconf-2 + gnome-base/libgnome-keyring + x11-libs/startup-notification + >=gnome-base/libgtop-2:2= + nls? ( >=sys-devel/gettext-0.14.1 ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gtk-doc-am + >=dev-util/intltool-0.35.5 + virtual/pkgconfig +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo +" + +PATCHES=( + # Fix compilation on bsd + "${FILESDIR}"/${PN}-2.0.0-fbsd.patch + + # Fix wrong usage of LDFLAGS, bug #226837 + "${FILESDIR}"/${PN}-2.0.7-libs.patch + + # Use po/LINGUAS + "${FILESDIR}"/${PN}-2.0.7-polinguas.patch + + # Don't forkpty; bug #298289 + "${FILESDIR}"/${P}-revert-forkpty.patch + + # Make this gmake-3.82 compliant, bug #333961 + "${FILESDIR}"/${P}-fix-make-3.82.patch + + # Do not build test programs that are never executed; also fixes bug + # #367397 (underlinking issues). + "${FILESDIR}"/${P}-notests.patch + + # Fix automake-1.11.2 compatibility, bug #397411 + "${FILESDIR}"/${P}-automake-1.11.2.patch + "${FILESDIR}"/${P}-missing-libs.patch + + # Fix build with format-security, bug #517614 + "${FILESDIR}"/${P}-format_security.patch + + # Fix .desktop file validation, bug #512364 + "${FILESDIR}"/${P}-desktop-validation.patch + + # Collection of patches from Debian + "${FILESDIR}"/${P}-g_markup_escape_text_for_command.patch + "${FILESDIR}"/${P}-sudo_keep_env.patch + "${FILESDIR}"/${P}-correct_colormap_get.patch +) + +src_prepare() { + sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026 + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + $(use_enable nls) \ + $(use_enable static-libs static) +} diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml new file mode 100644 index 000000000000..39980802b1da --- /dev/null +++ b/x11-libs/libgksu/metadata.xml @@ -0,0 +1,8 @@ + + + + + gnome@gentoo.org + Gentoo GNOME Desktop + + -- cgit v1.2.3