diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-03-12 06:46:08 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-03-12 06:46:08 +0000 |
| commit | c6e62298405d39e635c0d8dd6e026c8cb667a478 (patch) | |
| tree | 797bd877e6cc2cdcfe3e39ecfedf34781075fc86 /net-irc/psybnc/files | |
| parent | 2c3b9bbdb114cc13b6ef8e0e5933c9e374fca8b6 (diff) | |
gentoo auto-resync : 12:03:2024 - 06:46:08
Diffstat (limited to 'net-irc/psybnc/files')
| -rw-r--r-- | net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch | 23 | ||||
| -rw-r--r-- | net-irc/psybnc/files/psybnc-oidentd.initd | 8 | ||||
| -rw-r--r-- | net-irc/psybnc/files/psybnc.initd | 8 |
3 files changed, 31 insertions, 8 deletions
diff --git a/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch b/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch new file mode 100644 index 000000000000..cd0325613fe1 --- /dev/null +++ b/net-irc/psybnc/files/psybnc-2.4.3-strmncpy-lto-mismatch.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/861464 +--- a/src/p_global.h ++++ b/src/p_global.h +@@ -1109,7 +1109,7 @@ int replace(char *rps, char whatc, char toc); + char *nobreak(char *tobreak); + char *randstring(int length); + char *strmcat(char *first,char *second); +-char *strmncpy(char *dest, char *source, unsigned int len); ++char *strmncpy(char *dest, char *source, size_t len); + int strmncasecmp(char *one, char *two); + int strmcmp(char *one, char *two); + int strmwildcmp(char *line, char *wildcard); +--- a/src/p_string.c ++++ b/src/p_string.c +@@ -56,7 +56,7 @@ int ucase (char *inc) + + /* string copy with len and zero delimit */ + +-char *strmncpy(char *dest, char *source, unsigned int len) ++char *strmncpy(char *dest, char *source, size_t len) + { + char bf[strlen(source)+2]; + char *pt; diff --git a/net-irc/psybnc/files/psybnc-oidentd.initd b/net-irc/psybnc/files/psybnc-oidentd.initd index 354e6416c23e..b50c8b132c7c 100644 --- a/net-irc/psybnc/files/psybnc-oidentd.initd +++ b/net-irc/psybnc/files/psybnc-oidentd.initd @@ -7,19 +7,19 @@ depend() { } check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] + if [ ! -f ${PSYBNC_CONFIG} ] then eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" return 1 fi - if [[ ! -d "${PSYBNC_HOME}" ]] + if [ ! -d "${PSYBNC_HOME}" ] then eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" return 1 fi - if [[ -z "${PSYBNC_USER}" ]] + if [ -z "${PSYBNC_USER}" ] then eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" return 1 @@ -29,7 +29,7 @@ check_config() { start() { check_config || return 1 ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null + start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" -e HOME="${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" >/dev/null 2>&1 eend $? } diff --git a/net-irc/psybnc/files/psybnc.initd b/net-irc/psybnc/files/psybnc.initd index add37167139b..da01ec9ac422 100644 --- a/net-irc/psybnc/files/psybnc.initd +++ b/net-irc/psybnc/files/psybnc.initd @@ -7,19 +7,19 @@ depend() { } check_config() { - if [[ ! -f ${PSYBNC_CONFIG} ]] + if [ ! -f ${PSYBNC_CONFIG} ] then eerror "Please set \$PSYBNC_CONFIG in /etc/conf.d/psybnc!" return 1 fi - if [[ ! -d "${PSYBNC_HOME}" ]] + if [ ! -d "${PSYBNC_HOME}" ] then eerror "Please set \$PSYBNC_HOME in /etc/conf.d/psybnc!" return 1 fi - if [[ -z "${PSYBNC_USER}" ]] + if [ -z "${PSYBNC_USER}" ] then eerror "Please set \$PSYBNC_USER in /etc/conf.d/psybnc!" return 1 @@ -29,7 +29,7 @@ check_config() { start() { check_config || return 1 ebegin "Starting psyBNC" - start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" &>/dev/null + start-stop-daemon --start --quiet --chuid "${PSYBNC_USER}" --chdir "${PSYBNC_HOME}" --exec /usr/bin/psybnc -- "${PSYBNC_CONFIG}" >/dev/null 2>&1 eend $? } |