* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
@ 2017-07-08 7:50 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-08 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 6f479e1a55e376ef959b82b028339444348e79a3
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 07:50:09 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 07:50:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f479e1a
app-i18n/canna: update init script
Gentoo-Bug: 603702
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 4 +--
app-i18n/canna/canna-3.7_p3-r2.ebuild | 4 +--
app-i18n/canna/files/canna-3.7_p3.initd | 41 ----------------------
.../files/{canna-3.7_p3.confd => canna.confd} | 0
app-i18n/canna/files/canna.initd | 31 ++++++++++++++++
5 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2ee6f1090d1..2dac49233f0 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -84,8 +84,8 @@ src_install() {
# doins doc/man/guide/tex/canna.{dvi,ps,pdf}
#fi
- newinitd "${FILESDIR}"/${P}.initd canna || die
- newconfd "${FILESDIR}"/${P}.confd canna || die
+ newinitd "${FILESDIR}"/${PN}.initd canna || die
+ newconfd "${FILESDIR}"/${PN}.confd canna || die
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index fb7bc151458..6511e2168c8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -96,8 +96,8 @@ src_install() {
doins doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
- newinitd "${FILESDIR}"/${P}.initd canna || die
- newconfd "${FILESDIR}"/${P}.confd canna || die
+ newinitd "${FILESDIR}"/${PN}.initd canna || die
+ newconfd "${FILESDIR}"/${PN}.confd canna || die
insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
keepdir /var/log/canna/ || die
diff --git a/app-i18n/canna/files/canna-3.7_p3.initd b/app-i18n/canna/files/canna-3.7_p3.initd
deleted file mode 100644
index 9e21b061368..00000000000
--- a/app-i18n/canna/files/canna-3.7_p3.initd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
-CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs"
-
-depend() {
- after logger
-}
-
-start() {
- if [ -S /tmp/.iroha_unix/IROHA ] ; then
- /usr/sbin/cannakill >/dev/null 2>&1
- fi
- rm -f /tmp/.iroha_unix/IROHA
-
- if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog"
- else
- touch "${CANNASERVER_LOGFILE}"
- chmod u+w "${CANNASERVER_LOGFILEj}"
- fi
-
- if [ ! -z "${CANNASERVER_OWNER}" ] ; then
- if [ -f "${CANNASERVER_LOGFILE}" ] ; then
- chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
- fi
- CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}"
- fi
-
- ebegin "Starting canna"
- /usr/sbin/cannaserver ${CANNASERVER_OPTS}
- eend $? "Failed to start canna"
-}
-
-stop() {
- ebegin "Stopping canna"
- /usr/sbin/cannakill
- eend $? "Failed to stop canna"
-}
diff --git a/app-i18n/canna/files/canna-3.7_p3.confd b/app-i18n/canna/files/canna.confd
similarity index 100%
rename from app-i18n/canna/files/canna-3.7_p3.confd
rename to app-i18n/canna/files/canna.confd
diff --git a/app-i18n/canna/files/canna.initd b/app-i18n/canna/files/canna.initd
new file mode 100644
index 00000000000..97dac733fa9
--- /dev/null
+++ b/app-i18n/canna/files/canna.initd
@@ -0,0 +1,31 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/${RC_SVCNAME}server"
+command_args="${CANNASERVER_OPTS}"
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/${RC_SVCNAME}/CANNA0msgs"
+
+depend() {
+ use logger
+ need net
+}
+
+start_pre() {
+ if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ]; then
+ command_args="${command_args} -syslog"
+ elif [ -z "${CANNASERVER_OWNER}" ]; then
+ checkpath "${CANNASERVER_LOGFILE}"
+ else
+ checkpath -o "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+ command_args="${command_args} -u ${CANNASERVER_OWNER}"
+ fi
+}
+
+stop() {
+ ebegin "Stopping ${name:-${RC_SVCNAME}}"
+ /usr/sbin/${RC_SVCNAME}kill
+ eend ${?}
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
@ 2017-07-08 9:16 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-08 9:16 UTC (permalink / raw
To: gentoo-commits
commit: 9d262e2b7d298c04285f2e1357df1475a82bfc00
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 08:52:52 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 09:13:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d262e2b
app-i18n/canna: fix build with -Werror=format
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r2.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r3.ebuild | 1 +
app-i18n/canna/files/canna-Wformat.patch | 11 +++++++++++
4 files changed, 14 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index d6727b9c284..97dee1123ab 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 4bc24066bb8..2236655f622 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index c4ac85c584a..d794f10e8ed 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-canuum.patch
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
+ "${FILESDIR}"/${PN}-Wformat.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/files/canna-Wformat.patch b/app-i18n/canna/files/canna-Wformat.patch
new file mode 100644
index 00000000000..a8f5aa37163
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat.patch
@@ -0,0 +1,11 @@
+--- a/doc/man/guide/tex/cannaindex.c
++++ b/doc/man/guide/tex/cannaindex.c
+@@ -198,7 +198,7 @@
+ }
+ inf = fopen(argv[1], "r");
+ if (!inf) {
+- fprintf(stderr, "%s: Can not open file \"%s\".\n", argv[1]);
++ fprintf(stderr, "%s: Can not open file \"%s\".\n", program, argv[1]);
+ exit(1);
+ }
+ pages = readindex(inf, entries);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/
@ 2017-07-08 9:16 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-08 9:16 UTC (permalink / raw
To: gentoo-commits
commit: c88993e713f214c28fb151d8fb05a1425cc13ce5
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 8 08:54:52 2017 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Jul 8 09:13:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c88993e7
app-i18n/canna: fix build with -Werror=format-security
Gentoo-Bug: 521054
Package-Manager: Portage-2.3.6, Repoman-2.3.1
app-i18n/canna/canna-3.7_p3-r1.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r2.ebuild | 1 +
app-i18n/canna/canna-3.7_p3-r3.ebuild | 1 +
app-i18n/canna/files/canna-Wformat-security.patch | 199 ++++++++++++++++++++++
4 files changed, 202 insertions(+)
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 97dee1123ab..6a04c297b98 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 2236655f622..f6c43bc73d8 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r3.ebuild
index d794f10e8ed..bb324c8e8ea 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r3.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-kpdef.patch
"${FILESDIR}"/${PN}-posix-sort.patch
"${FILESDIR}"/${PN}-Wformat.patch
+ "${FILESDIR}"/${PN}-Wformat-security.patch
)
DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
diff --git a/app-i18n/canna/files/canna-Wformat-security.patch b/app-i18n/canna/files/canna-Wformat-security.patch
new file mode 100644
index 00000000000..c83552b5cba
--- /dev/null
+++ b/app-i18n/canna/files/canna-Wformat-security.patch
@@ -0,0 +1,199 @@
+--- a/cmd/catdic/can.c
++++ b/cmd/catdic/can.c
+@@ -1236,7 +1236,7 @@
+ break;
+ default:
+ if (init[0] == '/') {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ } else {
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+@@ -1297,11 +1297,11 @@
+
+ if ( opt_fq ) {
+ if ( opt_s ) {
+- (void) fprintf(stderr,msg_sfq);
++ (void) fprintf(stderr,"%s",msg_sfq);
+ exit(ERR_VALUE) ;
+ }
+ if ( opt_l || opt_std ) {
+- (void) fprintf(stderr,msg_l);
++ (void) fprintf(stderr,"%s",msg_l);
+ exit(ERR_VALUE) ;
+ }
+ mode = mode | PL_DIC ;
+@@ -1491,7 +1491,7 @@
+ break;
+ default:
+ if(init[0] == '/') {
+- fprintf(stderr,msg_abnl );
++ fprintf(stderr,"%s",msg_abnl );
+ }
+ else {
+ fprintf(stderr,msg_abnls,init);
+--- a/cmd/catdic/rutil.c
++++ b/cmd/catdic/rutil.c
+@@ -271,7 +271,7 @@
+ "Dictionary \"%s\" does not exist.\n"), dicname);
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ break;
+ case BADF :
+ (void)fprintf(stderr, gettxt("cannacmd:196",
+@@ -297,7 +297,7 @@
+ (void)fprintf(stderr,msg_abnls,init);
+ }
+ else {
+- (void)fprintf(stderr,msg_abnl);
++ (void)fprintf(stderr,"%s",msg_abnl);
+ }
+ break;
+ }
+@@ -321,7 +321,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ return ret;
+@@ -332,13 +332,13 @@
+ (void)fprintf(stderr, msg_mnts, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_mnt);
++ (void)fprintf(stderr, "%s", msg_mnt);
+ }
+ ret = -1;
+ return ret;
+ }
+ if ((mode & PL_DIC) == PL_DIC ) {
+- (void)fprintf(stderr,msg_fq);
++ (void)fprintf(stderr,"%s",msg_fq);
+ ret = -1 ;
+ return ret ;
+ }
+@@ -359,7 +359,7 @@
+ ret = 0;
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ ret = -1;
+ break;
+ case BADF :
+@@ -421,7 +421,7 @@
+ ret = -1;
+ break;
+ case BADCONT :
+- (void)fprintf(stderr,msg_cnt);
++ (void)fprintf(stderr,"%s",msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -429,7 +429,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ exit(ERR_VALUE);
+ break;
+@@ -448,7 +448,7 @@
+ ret = 0;
+ break;
+ case NOTALC :
+- (void)fprintf(stderr, msg_mem);
++ (void)fprintf(stderr, "%s", msg_mem);
+ ret = -1;
+ break;
+ case BADF :
+@@ -509,11 +509,11 @@
+ ret = -1;
+ break;
+ case BADARG :
+- (void)fprintf(stderr,msg_fq);
++ (void)fprintf(stderr,"%s",msg_fq);
+ ret = -1;
+ break;
+ case BADCONT :
+- (void)fprintf(stderr,msg_cnt);
++ (void)fprintf(stderr,"%s",msg_cnt);
+ ret = -1;
+ break;
+ case NOENT : /* 91.12.03 */
+@@ -526,7 +526,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ exit(ERR_VALUE);
+ break;
+@@ -556,7 +556,7 @@
+ (void)fprintf(stderr, msg_abnls,init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ return ret;
+@@ -567,13 +567,13 @@
+ (void)fprintf(stderr, msg_mnts, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_mnt);
++ (void)fprintf(stderr, "%s", msg_mnt);
+ }
+ ret = -1;
+ return ret;
+ }
+ if ((mode & PL_DIC) == PL_DIC ) {
+- (void)fprintf(stderr, msg_fq);
++ (void)fprintf(stderr, "%s", msg_fq);
+ ret = -1 ;
+ return ret ;
+ }
+@@ -608,7 +608,7 @@
+ ret = -2; /* 93.03.03 */
+ break;
+ case BADCONT :
+- (void)fprintf(stderr, msg_cnt);
++ (void)fprintf(stderr, "%s", msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -616,7 +616,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ break;
+@@ -651,7 +651,7 @@
+ ret = -2; /* 93.03.03 */
+ break;
+ case BADCONT :
+- (void)fprintf(stderr, msg_cnt);
++ (void)fprintf(stderr, "%s", msg_cnt);
+ ret = -1;
+ break;
+ default:
+@@ -659,7 +659,7 @@
+ (void)fprintf(stderr, msg_abnls, init);
+ }
+ else {
+- (void)fprintf(stderr, msg_abnl);
++ (void)fprintf(stderr, "%s", msg_abnl);
+ }
+ ret = -1;
+ break;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-08 9:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-08 7:50 [gentoo-commits] repo/gentoo:master commit in: app-i18n/canna/files/, app-i18n/canna/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2017-07-08 9:16 Akinori Hattori
2017-07-08 9:16 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox