From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- app-misc/pal/Manifest | 8 +++ app-misc/pal/files/0.4.3-ldflags.patch | 8 +++ app-misc/pal/files/0.4.3-strip.patch | 17 ++++++ .../pal/files/fix-Wformat-security-errors.patch | 64 ++++++++++++++++++++++ app-misc/pal/files/pal-0.4.3-pkg_config.patch | 14 +++++ app-misc/pal/files/pal-0.4.3-prefix.patch | 44 +++++++++++++++ app-misc/pal/metadata.xml | 13 +++++ app-misc/pal/pal-0.4.3-r2.ebuild | 61 +++++++++++++++++++++ 8 files changed, 229 insertions(+) create mode 100644 app-misc/pal/Manifest create mode 100644 app-misc/pal/files/0.4.3-ldflags.patch create mode 100644 app-misc/pal/files/0.4.3-strip.patch create mode 100644 app-misc/pal/files/fix-Wformat-security-errors.patch create mode 100644 app-misc/pal/files/pal-0.4.3-pkg_config.patch create mode 100644 app-misc/pal/files/pal-0.4.3-prefix.patch create mode 100644 app-misc/pal/metadata.xml create mode 100644 app-misc/pal/pal-0.4.3-r2.ebuild (limited to 'app-misc/pal') diff --git a/app-misc/pal/Manifest b/app-misc/pal/Manifest new file mode 100644 index 000000000000..8af0ba8a699f --- /dev/null +++ b/app-misc/pal/Manifest @@ -0,0 +1,8 @@ +AUX 0.4.3-ldflags.patch 188 BLAKE2B 2a691a724566b0f9e1303504cc7410e322a1b3dab1b6d34734a6e7b12b5102208180a6f5deb18908183dd75c3259c1dae9a0ab4b4cb768d286a34822fe0e85d2 SHA512 590852462185b57907c57f76bf76d7b4444e9deae8df85f66fc3aecee0b2539e41ce27f1097b7b24e12da46659bde163bb666317df8ec107cfbd6e26e1027d66 +AUX 0.4.3-strip.patch 300 BLAKE2B 404703b5eb2a6f014997cbef31d096017701c53791b6bffeb517a846683ca49a42b747395900f73fc3454f3e035a8779ba26099dd3bc9539162233460d7f93d4 SHA512 1ccf90c0c968e098fd1ad0dd61cc177ebc484ffa207b469b75aec63263dfb1cf9850218571b3f9609c4fea30c10678b115f24d78b4b17d0f57173712f7d5cf86 +AUX fix-Wformat-security-errors.patch 1909 BLAKE2B bd4b40533d3b9057a46f3b3c138777cc50138222a147f9d0987e4b0ad386fbb1dc8d9fa5b9aabd7e6685609ccc0dc73c353d24097ac5b6b7442a45149a0c20d9 SHA512 5c785d764afa40fe2a20ec489c8154bf6142c8aa13c71b3afbd09fac2f3b9d7cde26ab51bef02f6437037d48ef0054ecee1cc0d53db34a2492bd0f68300953a8 +AUX pal-0.4.3-pkg_config.patch 521 BLAKE2B c650d58ea769e0f1bfefd8987d9c856de56865982fc2965083eb1b8ad65799aa499506b356bcdafa5e272baee565e735c72076be5b930feba46d9a5be37b82e0 SHA512 216d34abd73cdfd7f539d4881c25717ae2bdf919df05ad553bf4ed3a0a8e8a616dcb688f06f6beee6b2f5943f3accf1d144ae3a226ee5a2d0078d5450640eaa5 +AUX pal-0.4.3-prefix.patch 1519 BLAKE2B 2f6c9bfddb55ff62caf49251e77b07890f8ed0231a2971b7a3c92e8f0dad92814399aeaf4b82d52a21ddae97a0c6058cf173c40e0c5bfcde62b5cb75bf63295e SHA512 428cc71d6775f33916e6b9025627027dc8b75fa66dadb4cef42b3e2167a662e04d94fff7edec68916efc3a1944f3579fa88e3324e0a131b7bc10d7f3105ea2c9 +DIST pal-0.4.3.tgz 130865 BLAKE2B 3d2629b534a644a3f760f64176340ffd73c0f33b6717e726662d6888a8007160a2978560f1e5f40140f128036e57a53e5b3c930fa07802f7170c1dc6fbce745d SHA512 8d543706e6dcabbdeb246ff18917b490da43c3211266dc67417906eb92602a107b066e2cb156da2b5362a19ac4992d1f21dc873485d3250912a53143f8257bf8 +EBUILD pal-0.4.3-r2.ebuild 1355 BLAKE2B 9dc141b143d013f416c33e0adf1402d297d68f9f788b194a318428c7e95f74b4aadc2c8a5e30d670fdc5c2f96c5c4120d4f3131100922ecee68430ae5ceaabdb SHA512 5c15a133be6a2adbaa5634128b4706e0f189942d102edb05450350b2b869e3e8e03f0fbca99953793149a44620f95699f3f0a5d8a3239db9fafb6b28df132d4d +MISC metadata.xml 509 BLAKE2B ff194eb470c0d979c58220dee03a777d0ac4c80c7d33f8fdab5a51f89983a2bd6326dc955f62fa5960f31c31e0b7274e38543e97e05e48fbd6d870862899b980 SHA512 cea3652f00f870d6db65ed87bc3b37b429cc4d3c8cb91d40742ca0dda93961d14779d348a84fe43d432e5a8dd4deb67ae2439151a8cb5c249fcf3b4e4ed2dcb4 diff --git a/app-misc/pal/files/0.4.3-ldflags.patch b/app-misc/pal/files/0.4.3-ldflags.patch new file mode 100644 index 000000000000..0bfd750ac5e7 --- /dev/null +++ b/app-misc/pal/files/0.4.3-ldflags.patch @@ -0,0 +1,8 @@ +--- a/src/Makefile.defs ++++ b/src/Makefile.defs +@@ -25,4 +25,4 @@ + + CFLAGS = ${OPT} + CPPFLAGS = ${INCLDIR} ${DEFS} +-LDFLAGS = ${LIBDIR} ${LIBS} ++LDFLAGS = ${LIBDIR} ${LIBS} ${LDOPT} diff --git a/app-misc/pal/files/0.4.3-strip.patch b/app-misc/pal/files/0.4.3-strip.patch new file mode 100644 index 000000000000..b3bfe3fd99f1 --- /dev/null +++ b/app-misc/pal/files/0.4.3-strip.patch @@ -0,0 +1,17 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -21,10 +21,10 @@ + $(NAME): $(OBJ) + @echo " [gcc] $(NAME)" + @$(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o $(NAME) +-ifneq ($(DEBUG),1) +- @echo " [strip] $(NAME)" +- @strip $(NAME) +-endif ++#ifneq ($(DEBUG),1) ++# @echo " [strip] $(NAME)" ++# @strip $(NAME) ++#endif + + + diff --git a/app-misc/pal/files/fix-Wformat-security-errors.patch b/app-misc/pal/files/fix-Wformat-security-errors.patch new file mode 100644 index 000000000000..f1255d9e55f1 --- /dev/null +++ b/app-misc/pal/files/fix-Wformat-security-errors.patch @@ -0,0 +1,64 @@ +From 801804d5b1beca5f32dd78cd23e9f9e012ae0420 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Tue, 2 Aug 2016 10:07:39 -0400 +Subject: [PATCH 1/1] src/{input,output}.c: fix -Wformat-security errors. + +Newer versions of GCC have the ability to warn about insecure uses of +format strings. These uses usually involve omitted "%s" format strings +to the printf() family of functions, and when compiling with +-Werror=format-security, they can cause the build to fail. This commit +fixes a few such uses in input.c and output.c + +Gentoo-Bug: 521104 +--- + src/input.c | 4 ++-- + src/output.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/input.c b/src/input.c +index 79db485..92bad36 100644 +--- a/src/input.c ++++ b/src/input.c +@@ -463,7 +463,7 @@ static gboolean get_file_to_load(gchar* file, gchar* pal_file, gboolean show_err + return FALSE; + } + else +- sprintf(pal_file, file); ++ sprintf(pal_file, "%s", file); + } + + else +@@ -618,7 +618,7 @@ GHashTable* load_files() + FILE* pal_file_handle = NULL; + + if(!get_file_to_load(settings->pal_file, pal_file, FALSE)) +- sprintf(pal_file, settings->pal_file); ++ sprintf(pal_file, "%s", settings->pal_file); + + pal_file_handle = get_file_handle(pal_file, TRUE); + if(pal_file_handle != NULL) +diff --git a/src/output.c b/src/output.c +index 97aaa0f..9806089 100644 +--- a/src/output.c ++++ b/src/output.c +@@ -249,7 +249,7 @@ static void pal_output_text_week(GDate* date, gboolean force_month_label, + pal_output_fg(BRIGHT, color, utf8_buf); + } + else +- g_print(utf8_buf); ++ g_print("%s", utf8_buf); + + + if(g_date_compare(date,today) == 0) /* make today bright */ +@@ -270,7 +270,7 @@ static void pal_output_text_week(GDate* date, gboolean force_month_label, + + } + else +- g_print(utf8_buf); ++ g_print("%s", utf8_buf); + + + /* print extra space between days */ +-- +2.7.3 + diff --git a/app-misc/pal/files/pal-0.4.3-pkg_config.patch b/app-misc/pal/files/pal-0.4.3-pkg_config.patch new file mode 100644 index 000000000000..2a299538e999 --- /dev/null +++ b/app-misc/pal/files/pal-0.4.3-pkg_config.patch @@ -0,0 +1,14 @@ +--- a/src/Makefile ++++ b/src/Makefile +@@ -2,9 +2,9 @@ + + include Makefile.defs + +-INCLDIR = -I${prefix}/include `pkg-config --cflags glib-2.0` ++INCLDIR = -I${prefix}/include $(shell ${PKG_CONFIG} --cflags glib-2.0) + LIBDIR = +-LIBS = `pkg-config --libs glib-2.0` -lreadline -lncurses ++LIBS = $(shell ${PKG_CONFIG} --libs glib-2.0) -lreadline $(shell ${PKG_CONFIG} --libs ncurses) + + SRC = main.c colorize.c output.c input.c event.c rl.c html.c latex.c \ + add.c edit.c del.c remind.c search.c manage.c diff --git a/app-misc/pal/files/pal-0.4.3-prefix.patch b/app-misc/pal/files/pal-0.4.3-prefix.patch new file mode 100644 index 000000000000..08dfba41c7e7 --- /dev/null +++ b/app-misc/pal/files/pal-0.4.3-prefix.patch @@ -0,0 +1,44 @@ +--- a/src/Makefile.defs ++++ b/src/Makefile.defs +@@ -3,7 +3,7 @@ + + # directory to install to. Depending on your distribution, you might + # want to change this to /usr/local +-prefix = /usr ++prefix = @GENTOO_PORTAGE_EPREFIX@/usr + CC = gcc + + PAL_VERSION = 0.3.5_pre1 +--- a/src/input.c ++++ b/src/input.c +@@ -567,7 +567,7 @@ + } + + /* attempt to copy /etc/pal.conf to ~/.pal/pal.conf */ +- file = fopen("/etc/pal.conf", "r"); ++ file = fopen("@GENTOO_PORTAGE_EPREFIX@/etc/pal.conf", "r"); + + /* if not found, try PREFIX/share/pal/pal.conf instead */ + /* NOTE: This is will be removed in the future */ +@@ -577,7 +577,7 @@ + + if(file == NULL) + { +- pal_output_error(_("ERROR: Can't open file: /etc/pal.conf\n")); ++ pal_output_error(_("ERROR: Can't open file: @GENTOO_PORTAGE_EPREFIX@/etc/pal.conf\n")); + pal_output_error(_("ERROR: Can't open file: " PREFIX "/share/pal/pal.conf\n")); + pal_output_error(_("ERROR: This indicates an improper installation.\n")); + return ht; +--- a/src/Makefile ++++ b/src/Makefile +@@ -51,8 +51,8 @@ + @echo " --- Installing global data --- " + @mkdir -p ${DESTDIR}${prefix}/share/pal; + install -m 0644 -o root ../share/*.pal ${DESTDIR}${prefix}/share/pal +- @mkdir -p ${DESTDIR}/etc; +- install -m 0644 -o root ../pal.conf ${DESTDIR}/etc/ ++ @mkdir -p ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc; ++ install -m 0644 -o root ../pal.conf ${DESTDIR}@GENTOO_PORTAGE_EPREFIX@/etc/ + @echo + + # "install" will install the files needed by pal and also check to see diff --git a/app-misc/pal/metadata.xml b/app-misc/pal/metadata.xml new file mode 100644 index 000000000000..9c65100f6b4b --- /dev/null +++ b/app-misc/pal/metadata.xml @@ -0,0 +1,13 @@ + + + + + + pal is a command-line calendar program for Unix/Linux systems that can keep + track of events. It has similarities with the Unix cal command, the more + complex GNU gcal program and the calendar program distributed with the BSDs. + + + palcal + + diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild new file mode 100644 index 000000000000..4b730ffb3e7c --- /dev/null +++ b/app-misc/pal/pal-0.4.3-r2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit prefix toolchain-funcs + +DESCRIPTION="Command-line calendar program" +HOMEPAGE="http://palcal.sourceforge.net/" +SRC_URI="mirror://sourceforge/palcal/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos" +IUSE="nls" + +RDEPEND=" + >=dev-libs/glib-2.0 + nls? ( virtual/libintl ) + sys-libs/ncurses:0 + sys-libs/readline:0 +" +DEPEND=" + ${RDEPEND} + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +RESTRICT="test" # Has no tests to run + +PATCHES=( + "${FILESDIR}"/${PV}-strip.patch + "${FILESDIR}"/${PV}-ldflags.patch + "${FILESDIR}"/${P}-pkg_config.patch + "${FILESDIR}"/${P}-prefix.patch + "${FILESDIR}"/fix-Wformat-security-errors.patch +) + +src_prepare() { + default + + cd src || die "failed to change to the src directory" + eprefixify Makefile.defs input.c Makefile + sed -i -e 's/ -o root//g' {.,convert}/Makefile || die + tc-export PKG_CONFIG +} + +src_compile() { + cd src || die "failed to change to the src directory" + emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}" +} + +src_install() { + dodoc ChangeLog doc/example.css + + cd src || die "failed to change to the src directory" + emake DESTDIR="${D}" install-man install-bin install-share + + if use nls; then + emake DESTDIR="${D}" install-mo + fi +} -- cgit v1.2.3