From d1d8adbfd346340c3784c72a9fa0868dde6ff736 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 27 Jul 2022 15:01:59 +0100 Subject: gentoo auto-resync : 27:07:2022 - 15:01:59 --- app-cdr/Manifest.gz | Bin 7839 -> 7835 bytes app-cdr/xcdroast/Manifest | 11 +-- app-cdr/xcdroast/files/cdda2wav_version.patch | 54 --------------- app-cdr/xcdroast/files/disable_version_check.patch | 11 --- .../xcdroast/files/fix_cddb_hidden_tracks.patch | 45 ------------ app-cdr/xcdroast/files/format-security.patch | 11 --- app-cdr/xcdroast/files/io_compile.patch | 21 ------ app-cdr/xcdroast/files/io_progressbar_fix.patch | 39 ----------- app-cdr/xcdroast/files/suid-perms.patch | 36 ---------- app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild | 76 --------------------- app-cdr/xcdroast/xcdroast-1.19-r1.ebuild | 2 +- 11 files changed, 2 insertions(+), 304 deletions(-) delete mode 100644 app-cdr/xcdroast/files/cdda2wav_version.patch delete mode 100644 app-cdr/xcdroast/files/disable_version_check.patch delete mode 100644 app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch delete mode 100644 app-cdr/xcdroast/files/format-security.patch delete mode 100644 app-cdr/xcdroast/files/io_compile.patch delete mode 100644 app-cdr/xcdroast/files/io_progressbar_fix.patch delete mode 100644 app-cdr/xcdroast/files/suid-perms.patch delete mode 100644 app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild (limited to 'app-cdr') diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz index a096723d584c..5768c6c9dd84 100644 Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest index c92d58c3576e..2e4cf0bbc1ed 100644 --- a/app-cdr/xcdroast/Manifest +++ b/app-cdr/xcdroast/Manifest @@ -1,12 +1,3 @@ -AUX cdda2wav_version.patch 1494 BLAKE2B f6772d32c3f9d28e727f0fb86d58e929631a55b0708de46722527387f8fc8dd8db1575fd4681a68fa1861c0d4a4ed42008930af972220fc9de561f973e14d406 SHA512 d792b4b348441f7f07c84e9bb6a533956f3a132b5b9a39cf65c76bc71f4308809f425aa1f447339530c19efb015e10990197248ff85c4a2d88b3a3bb12a2df51 -AUX disable_version_check.patch 296 BLAKE2B b8b59c238028906593d2aece2f1ce184c9850e3ce7e39b498c84f066b42008e829432d77986ba7bbaec6a5f9c80646042af70a051dd14bb6541b770ff822f0f8 SHA512 97cc36e91cb997b577700c97e29b89780095df043dc5739e51b67a9741991504b4a8f7bde9697c1bff478b39dfdf222b7dfcaf8684ab98861136fd7eb0b97bac -AUX fix_cddb_hidden_tracks.patch 1256 BLAKE2B c944682453dc9e9a4675b8b6fb77cee6b4955d20e2669ea86520e8f0c49c1d2537afb73691dc64a0c11edee4da656840831c7826c0fe31bfc26d843e6ba491f9 SHA512 8aa10b3bbe65e1c56ef1b6fb47ff4de9af4e7cfe323fb1588d25a288818b569a8a6efff340b5f16c26f5f199379325f6779f4fd69465ddbe332c4c72068ad332 -AUX format-security.patch 316 BLAKE2B a0de5c35bbf0ff3642e835f7febfec67d6cc12ec7c789d05a345c8f34a18ea95bb3692273311d73dc5821973de204a55411741b15f9e8232f9cc0a0f581c8fb8 SHA512 8c9aca33910ae791f5a5e5d7ed99329df1925b28f38f7ee71287cd9ef40cda231b26fc207c68931b830f7ea67f131045a23b296d55e009935120a1fb48908da4 -AUX io_compile.patch 625 BLAKE2B e1737c621d4305fc67f871ae32301f440fab9cea25c93482fd63f4a98d1c96fb1b7a9215c3d559023d7ea8b67ab59b71e535ba45a87c5bd997ab9b8690bb404c SHA512 823b26a63729ae1f87a0ce156708cc49bdf5d699de73a42be97e21488f5ca5efb0ea6d6285aea49a5b00d3f6fc0d5f2017493aa6ebef4a70748806e6ad7cf2a0 -AUX io_progressbar_fix.patch 806 BLAKE2B bb9b5a68580ba937a3ca16f9b5e7bab9a9843a23fa6058cd61d7b984e4a41c165e8c9b9dbb024beff5094d6f9a94ee71e3d9da080de245b949c35d742b678265 SHA512 7ac76062e49c7480157b16ad11d45ca81e6394515ad897fe59be8a6af938ac7d11e4d1160b21447c83e6aaed0147d29b3260a001d52eac1e806608e3b027d579 -AUX suid-perms.patch 1362 BLAKE2B c0ddb6945070c021eddca470df8e6f82882e490f8433447d0628a91c14601f0aa5e89ed1b058fbf2917e95b18a77fb8e26693dba4eba0b9324bb3aab20572bc1 SHA512 ca96f168cff8fe4052de92ac58451d39532d959be428284da7dc6307f0cd36e661e760b8dd5f5902260cc3a953b51e894b4b87ca4f0340f98f079da5c97c4a7a -DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7 DIST xcdroast-1.19.tar.gz 3448552 BLAKE2B 2e4e2b5119d5002870142d95345ddd33dad40c5a9d7517594da0dfd945bea012d5391b61fb6264d790aaaacf4de6b990fc77f4b40fab594ac1a5d2279dafa933 SHA512 79449353ba5a1be990366e85bd807e4ef35ec19f021986634ee9549608dca0e447b61dbbed0f30f588baac49fc6b93c055800bedb629ff77274d7da7c39d7881 -EBUILD xcdroast-0.98_alpha16-r3.ebuild 1513 BLAKE2B 3fa1536535cf517fcfb247f8aca2eae1365c388a0cab1651aa9598b3b6c784c16c91b3c0a808b467221ad8a44df08f5ffdd9046e62035ab150b5a214a291e920 SHA512 b15971f106fe8cec6224356123fbb28fc9c4ac25c9491c1e4d305192fa3a988286c11524312aa38e92cc98dcf9a0f7c696e242b0efad5ffbd49aadb2ca8dfc40 -EBUILD xcdroast-1.19-r1.ebuild 836 BLAKE2B eadd39f7a97a98b3669342fc28872388c7adb4e38aae4b9f004ab3217449258b040fc7c34370d84cf4e25cf4f77f455a63e03f9b11e83aaf5f6f8777b9e24a10 SHA512 0eeae0a75906465244cd670bc03b1da2f8b7d7f6b64ece046b2b3d7be7dfa62513e8b7d06a29248c9242222817027a22b7a5f89c5fdfdf905212a6951d6c0487 +EBUILD xcdroast-1.19-r1.ebuild 835 BLAKE2B 21e0a2c20d8e0279b602a223d373209a2b7cce0080d987896782b056b07ed8a9bc386dfb8187630c4dc7902e21984724499fbb8e9e7919fb82ab21965ee0ba2f SHA512 c27c77291715a415ab519bc953739edf371bd1f438eabf0cf61e990de4ec43254e2c41cdc294b221933674d99e50823a20d9b1b4ff990247f703c55fa21ef665 MISC metadata.xml 245 BLAKE2B e15022e3e73c9053c3465d1bd1fc1e652d9194ef5e98d0199152716c01b21244edc7b10af28209408b47e5fdc9a476c316072de87c017297ddd9ccc6f255ea7d SHA512 e4085522aa9abc0509372f8f63ac0ea3de80e6ba697b2acc0f6b822598c99b3967df43413305b9dafb4b2dff0f11adfd5e5732919652ab0812aa9f364fde32f2 diff --git a/app-cdr/xcdroast/files/cdda2wav_version.patch b/app-cdr/xcdroast/files/cdda2wav_version.patch deleted file mode 100644 index cd001e0ee7bf..000000000000 --- a/app-cdr/xcdroast/files/cdda2wav_version.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -urNad xcdroast-0.98+0alpha16~/src/io.c xcdroast-0.98+0alpha16/src/io.c ---- xcdroast-0.98+0alpha16~/src/io.c 2008-08-21 15:11:40.000000000 +0200 -+++ xcdroast-0.98+0alpha16/src/io.c 2009-12-29 22:54:08.571188849 +0100 -@@ -10062,6 +10062,7 @@ - - gint check_version_cdda2wav(gchar *match, gchar *found) { - gchar line[MAXLINE]; -+gchar vline[MAXLINE]; - gchar ver[MAXLINE]; - FILE *fpin; - gchar *p; -@@ -10076,32 +10077,38 @@ - } - - strcpy(line,""); -+ strcpy(vline,""); - for (;;) { - if (fgets(line,MAXLINE,fpin) == NULL) - break; - dodebug(10,"got: %s",line); -+ -+ /* only get first line */ -+ if (strcmp(vline,"") == 0) { -+ strncpy(vline, line, MAXLINE); -+ } - } - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); - } - -- if (strcmp(line,"") == 0 || strstr(line,"sh:") != NULL) { -+ if (strcmp(vline,"") == 0 || strstr(vline,"sh:") != NULL) { - /* failed to open - permission denied */ - return 2; - } - -- /* now line contains the version string of cdda2wav */ -+ /* now vline contains the version string of cdda2wav */ - /* try to extract the version number */ - -- p = strstr(line,"version"); -+ p = strstr(vline,"version"); - if (p != NULL) { - p = strtok(p+8, " _"); - if (p != NULL) { - strcpy(ver,p); - } - } else { -- p = strstr(line,"cdda2wav"); -+ p = strstr(vline,"cdda2wav"); - if (p != NULL) { - p = strtok(p+9, " "); - if (p != NULL) { diff --git a/app-cdr/xcdroast/files/disable_version_check.patch b/app-cdr/xcdroast/files/disable_version_check.patch deleted file mode 100644 index e72c4d0ddb36..000000000000 --- a/app-cdr/xcdroast/files/disable_version_check.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/init.c 2016-07-08 12:00:17.705356781 +0200 -+++ b/src/init.c 2016-07-08 12:02:35.914358133 +0200 -@@ -790,7 +790,7 @@ - debug = 0; - oldfontcode = 0; - *altdevscan = 1; -- no_versioncheck = 0; -+ no_versioncheck = 1; - support_ontheflyaudio = 0; - c_locale_is_utf8 = 0; - ignoreProDVD = 0; diff --git a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch b/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch deleted file mode 100644 index ca532f20d359..000000000000 --- a/app-cdr/xcdroast/files/fix_cddb_hidden_tracks.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- a/src/io.c -+++ b/src/io.c -@@ -2665,6 +2665,8 @@ - g_error("Unexpected output in cdda2wav toc-output\n"); - } - trackinfo[tocnr]->track_nr = atoi(p1); -+ if (trackinfo[tocnr]->track_nr == 0) -+ cdinfo.nr_tracks++; - trackinfo[tocnr]->isosize = -1; - - /* reststring into tmp2 - strip to remove leading spaces */ -@@ -8401,6 +8403,9 @@ - if (extract_quoted(tmp) != 0) - return; - -+ if (matchnr == 0 && trackinfo[matchnr]->track_nr == 0) -+ matchnr++; -+ - if (mode == 0) { - if (matchnr >= cdinfo.nr_tracks) { - g_warning("invalid track count from cddb-server\n"); -@@ -8482,14 +8487,20 @@ - - /* build of command line */ - if (mode == 0 || mode == 2) { -+ gint ntr = cdinfo.nr_tracks; -+ -+ if (ntr > 0 && trackinfo[0]->track_nr == 0) -+ ntr--; - g_snprintf(tmp,MAXLINE,"cddb query %s %d ", -- cdinfo.cddb_discid, cdinfo.nr_tracks); -+ cdinfo.cddb_discid, ntr); - for (i = 0; i < cdinfo.nr_tracks; i++) { -+ if (trackinfo[i]->track_nr == 0) -+ continue; - g_snprintf(tmp2,MAXLINE,"%d ", - trackinfo[i]->start_sec + 150); - strcat(tmp,tmp2); - } -- g_snprintf(tmp2,MAXLINE,"%d",cdinfo.total_size / 75); -+ g_snprintf(tmp2,MAXLINE,"%d",(cdinfo.leadout + 150) / 75); - strcat(tmp,tmp2); - } else { - /* get data from toc file */ - diff --git a/app-cdr/xcdroast/files/format-security.patch b/app-cdr/xcdroast/files/format-security.patch deleted file mode 100644 index 9d01cf4f7758..000000000000 --- a/app-cdr/xcdroast/files/format-security.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xcdroast-0.98alpha16/src/setup.c.orig 2008-08-21 12:07:18.000000000 +0400 -+++ xcdroast-0.98alpha16/src/setup.c 2016-07-09 11:26:54.724084818 +0300 -@@ -4468,7 +4468,7 @@ - if (!textonly) { - show_dialog(ICO_ERROR,tmp, T_OK, NULL, NULL, 0); - } else { -- g_warning(tmp); -+ g_warning("%s",tmp); - } - } - } diff --git a/app-cdr/xcdroast/files/io_compile.patch b/app-cdr/xcdroast/files/io_compile.patch deleted file mode 100644 index 339523d42f75..000000000000 --- a/app-cdr/xcdroast/files/io_compile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/src/io.c.org 2009-02-24 09:38:27.000000000 +0100 -+++ b/src/io.c 2009-02-24 09:45:18.000000000 +0100 -@@ -1903,7 +1903,8 @@ - } - - strcpy(str,""); -- fgets(str,MAXLINE,fpin); -+ if (fgets(str,MAXLINE,fpin) == NULL) -+ g_error("fgets error\n"); - - if (pclose(fpin) == -1) { - g_error("pclose error\n"); -@@ -4720,7 +4721,7 @@ - dolog(3, "Saving extended output to %s\n", fname); - - /* write to file */ -- fd = open(fname,O_WRONLY | O_CREAT); -+ fd = open(fname, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); - if (fd < 0) { - g_warning("Can't open file %s for writing\n",fname); - return 1; diff --git a/app-cdr/xcdroast/files/io_progressbar_fix.patch b/app-cdr/xcdroast/files/io_progressbar_fix.patch deleted file mode 100644 index 745af45d7e73..000000000000 --- a/app-cdr/xcdroast/files/io_progressbar_fix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/io.c.last So. Jan 24 19:18:45 2010 -+++ b/src/io.c Fr. Jul 16 10:59:32 2010 -@@ -3202,6 +3202,8 @@ - close(fd2[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup child */ - if (execl("/bin/sh", "sh", "-c", cmd ,(void *)NULL) < 0) { - g_error("execl error\n"); -@@ -3402,6 +3404,8 @@ - close(fd3[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup child */ - if (execv(callpath,arglist) < 0) { - g_error("execv error\n"); -@@ -3506,6 +3510,8 @@ - close(pipefd[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup first child */ - if (execv(callpath,arglist) < 0) { - g_error("execv error\n"); -@@ -3568,6 +3574,8 @@ - close(fd3[1]); - } - -+ g_setenv("LC_ALL", "C", TRUE); -+ - /* startup second child */ - if (execv(callpath2,arglist2) < 0) { - g_error("execv error\n"); - diff --git a/app-cdr/xcdroast/files/suid-perms.patch b/app-cdr/xcdroast/files/suid-perms.patch deleted file mode 100644 index 1c804bc1775c..000000000000 --- a/app-cdr/xcdroast/files/suid-perms.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naurd xcdroast-0.98alpha16.orig/doc/README.nonroot xcdroast-0.98alpha16/doc/README.nonroot ---- xcdroast-0.98alpha16.orig/doc/README.nonroot 2003-10-27 23:37:40.000000000 +0300 -+++ xcdroast-0.98alpha16/doc/README.nonroot 2016-07-07 21:32:35.006587826 +0300 -@@ -72,7 +72,7 @@ - Please change now to the corresponding directory and enter: - - chown root xcdrwrap -- chmod 4755 xcdrwrap -+ chmod 4711 xcdrwrap - - - Usage of the non-root-mode -diff -Naurd xcdroast-0.98alpha16.orig/src/init.c xcdroast-0.98alpha16/src/init.c ---- xcdroast-0.98alpha16.orig/src/init.c 2008-08-20 20:20:23.000000000 +0400 -+++ xcdroast-0.98alpha16/src/init.c 2016-07-07 21:32:35.006587826 +0300 -@@ -670,7 +670,7 @@ - - /* check file mode of wrapper */ - if (stat(tmp,&buf) == 0) { -- if (buf.st_mode != 0104755) { -+ if (buf.st_mode != 0104711) { - dodebug(3,"Note: %s wrong modes set (0%o)\n", tmp, buf.st_mode); - nofail = 0; - } -diff -Naurd xcdroast-0.98alpha16.orig/src/io.c xcdroast-0.98alpha16/src/io.c ---- xcdroast-0.98alpha16.orig/src/io.c 2008-08-21 17:11:40.000000000 +0400 -+++ xcdroast-0.98alpha16/src/io.c 2016-07-07 21:32:35.003587931 +0300 -@@ -10380,7 +10380,7 @@ - strcat(ret,tmp); - #endif - /* old nonroot mode - 2755 */ -- g_snprintf(tmp,MAXLINE,"%s 4755 %s\n", cmd_chmod, bin); -+ g_snprintf(tmp,MAXLINE,"%s 4711 %s\n", cmd_chmod, bin); - strcat(ret,tmp); - - diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild deleted file mode 100644 index 5302219832b5..000000000000 --- a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit desktop gnome2-utils - -DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing" -HOMEPAGE="http://www.xcdroast.org/" -SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" -IUSE="nls suid" - -RDEPEND=">=x11-libs/gtk+-2:2 - app-cdr/cdrtools" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -S=${WORKDIR}/${P/_/} - -PATCHES=( - "${FILESDIR}"/cdda2wav_version.patch - "${FILESDIR}"/fix_cddb_hidden_tracks.patch - "${FILESDIR}"/io_compile.patch - "${FILESDIR}"/io_progressbar_fix.patch - "${FILESDIR}"/suid-perms.patch - "${FILESDIR}"/disable_version_check.patch - "${FILESDIR}"/format-security.patch -) - -src_prepare() { - default - - # fix Norwegian locales - mv po/{no,nb}.po || die - mv po/{no,nb}.gmo || die - sed -i -e 's/no/nb/' po/LINGUAS || die -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable suid nonrootmode) \ - --enable-gtk2 \ - --mandir=/usr/share/man \ - --sysconfdir=/etc -} - -src_compile() { - emake PREFIX=/usr -} - -src_install() { - emake PREFIX=/usr DESTDIR="${D}" install - dodoc -r AUTHORS ChangeLog README doc/* - - insinto /usr/share/icons/hicolor/48x48/apps - newins xpms/xcdricon.xpm xcdroast.xpm - - make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild index 63b715197b22..0f851eefc3d9 100644 --- a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild +++ b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/} LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~sparc x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="nls suid" RDEPEND=">=app-cdr/cdrtools-3.02_alpha09 -- cgit v1.2.3