[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/files/
commit: 4de3ffd2f7fea876a35d5fabd6105c92d004a84b
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon May 13 16:53:17 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Mon May 13 18:42:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de3ffd2
net-irc/psybnc: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Joonas Niilola gentoo.org>
net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch | 79 --
.../psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch | 12
2 files changed, 91 deletions(-)
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
deleted file mode 100644
index 99e55b6d8cdc..
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c
a/src/p_blowfish.c 2007-02-26 12:16:53.0 +
-+++ b/src/p_blowfish.c 2007-02-26 12:17:11.0 +
-@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$
- #include
- #include
-
--char *strmncpy(char *dest, char *source, size_t len);
-+char *strmncpy(char *dest, const char *source, size_t len);
- char *lngtxt(int msgnum);
-
- #define pcontext {
strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc));
cline=__LINE__; }
-diff -Naurp a/src/p_global.h b/src/p_global.h
a/src/p_global.h 2007-02-26 12:16:53.0 +
-+++ b/src/p_global.h 2007-02-26 12:17:11.0 +
-@@ -972,8 +972,8 @@ int checklogging(int usern);
- #endif
-
- #ifndef P_MEMORY
--unsigned long *__pmalloc(unsigned long size,char *module,char *function,int
line);
--void _pfree(void * pointer,char *module, char *function, int line);
-+unsigned long *__pmalloc(unsigned long size,const char *module,const char
*function,int line);
-+void _pfree(void * pointer,char *module, const char *function, int line);
- struct usert *user(int usern);
- struct newpeert *newpeer(int usern);
- struct datalinkt *datalink(int usern);
-@@ -1092,7 +1092,7 @@ int replace(char *rps, char whatc, char
- 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, const char *source, unsigned int len);
- int strmncasecmp(char *one, char *two);
- int strmcmp(char *one, char *two);
- int strmwildcmp(char *line, char *wildcard);
-diff -Naurp a/src/p_memory.c b/src/p_memory.c
a/src/p_memory.c 2007-02-26 12:16:53.0 +
-+++ b/src/p_memory.c 2007-02-26 12:17:11.0 +
-@@ -32,7 +32,7 @@ FILE *logm=NULL;
-
- /* malloc-wrapper. No memory will log an error entry and kill the bouncer */
-
--unsigned long *__pmalloc(unsigned long size,char *module,char *function, int
line)
-+unsigned long *__pmalloc(unsigned long size,const char *module,const char
*function, int line)
- {
- unsigned long *rc;
- if (!(rc=(unsigned long *)malloc(size)))
-@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
- return rc;
- }
-
--void _pfree(unsigned long *pointer, char *module, char *function, int line)
-+void _pfree(unsigned long *pointer, char *module, const char *function, int
line)
- {
- #ifdef LOGALLOC
- if(logm==NULL)
-diff -Naurp a/src/p_string.c b/src/p_string.c
a/src/p_string.c 2007-02-26 12:16:53.0 +
-+++ b/src/p_string.c 2007-02-26 12:17:11.0 +
-@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
-
- /* string copy with len and zero delimit */
-
--char *strmncpy(char *dest, char *source, unsigned int len)
-+char *strmncpy(char *dest, const char *source, unsigned int len)
- {
- char bf[strlen(source)+2];
- char *pt;
-diff -Naurp a/src/match.c b/src/match.c
a/src/match.c 2007-02-26 12:26:10.0 +
-+++ b/src/match.c 2007-02-26 12:26:17.0 +
-@@ -36,6 +36,7 @@
- /* Remove the next line to use this in IrcII */
- #define EGGDROP
-
-+#include
-
- /* ===
- * Best to leave stuff after this point alone, but go on and change
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
deleted file mode 100644
index f5bc776b1e6b..
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurp a/tools/autoconf.c b/tools/autoconf.c
a/tools/autoconf.c 2010-10-10 20:25:29.295001235 +
-+++ b/tools/autoconf.c 2010-10-10 20:26:02.738999569 +
-@@ -449,7 +449,7 @@ int main()
- fprintf(makefile,"TARGET = psybnc\n");
- fprintf(makefile,"\n");
- fprintf(makefile,"all:$(OBJS)\n");
--fprintf(makefile,"$(CC) -o $(TARGET) $(CFLAGS) $(OBJS)
$(LIBS)\n");
-+fprintf(makefile,"$(CC) -o $(TARGET) $(CFLAGS) $(LDFLAGS) $(OBJS)
$(LIBS)\n");
-
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/files/
commit: 0872ae0dfff26bb6f240a59dd1207915dbb1413c
Author: Sam James gentoo org>
AuthorDate: Tue Mar 12 04:07:20 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 12 04:07:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0872ae0d
net-irc/psybnc: fix bashisms in init script
I just pushed a new version so not worrying about revbump.
Closes: https://bugs.gentoo.org/848915
Signed-off-by: Sam James gentoo.org>
net-irc/psybnc/files/psybnc-oidentd.initd | 8
net-irc/psybnc/files/psybnc.initd | 8
2 files changed, 8 insertions(+), 8 deletions(-)
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 $?
}
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: f88419144f82685f57abd2267eb9e0f7d18bf911 Author: Sam James gentoo org> AuthorDate: Tue Mar 12 04:05:51 2024 + Commit: Sam James gentoo org> CommitDate: Tue Mar 12 04:05:51 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8841914 net-irc/psybnc: add missing c-ares dep Closes: https://bugs.gentoo.org/913467 Signed-off-by: Sam James gentoo.org> net-irc/psybnc/psybnc-2.4.3-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-irc/psybnc/psybnc-2.4.3-r1.ebuild b/net-irc/psybnc/psybnc-2.4.3-r1.ebuild index ebcd857f24bb..e9be325cd095 100644 --- a/net-irc/psybnc/psybnc-2.4.3-r1.ebuild +++ b/net-irc/psybnc/psybnc-2.4.3-r1.ebuild @@ -21,6 +21,7 @@ IUSE="ipv6 ssl oidentd scripting multinetwork" DEPEND=" acct-group/psybnc acct-user/psybnc + net-dns/c-ares ssl? ( >=dev-libs/openssl-0.9.7d:= ) oidentd? ( >=net-misc/oidentd-2.0 ) "
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: d47ad57298ce0b2d3eb72db960d901af9d84ed5a
Author: Sam James gentoo org>
AuthorDate: Tue Mar 12 04:03:27 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Mar 12 04:03:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d47ad572
net-irc/psybnc: drop 2.3.2.9-r4
Bug: https://bugs.gentoo.org/921135
Signed-off-by: Sam James gentoo.org>
net-irc/psybnc/Manifest | 1 -
net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild | 166
2 files changed, 167 deletions(-)
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 9ff638d4d120..f6983e85c549 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1,2 +1 @@
-DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B
0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64
SHA512
b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B
e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb
SHA512
02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
deleted file mode 100644
index 684b08d88a1f..
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV="$(ver_rs 3 -)"
-PSYBNC_HOME="/var/lib/psybnc"
-
-DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
-HOMEPAGE="http://www.psybnc.at/index.html;
-SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
-S="${WORKDIR}"/${PN}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 ssl oidentd scripting multinetwork"
-
-DEPEND="
- acct-group/psybnc
- acct-user/psybnc
- ssl? ( >=dev-libs/openssl-0.9.7d:= )
- oidentd? ( >=net-misc/oidentd-2.0 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.2.9-compile.patch
- "${FILESDIR}"/${PN}-2.3.2.9-ldflags-fix.patch
-)
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
-
- # Useless files
- rm -f */INFO || die
-
- # Pretend we already have a certificate, we generate it in pkg_config
- touch key/psybnc.cert.pem || die
-
- if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
- einfo "Using existing salt.h for password encryption"
- cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
- fi
-}
-
-src_prepare() {
- default
-
- # Add oidentd
- use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch )
-
- # Add scripting support
- use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch )
-
- # Add multinetwork support
- use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch )
-
- # Prevent stripping the binary
- sed -i -e "/@strip/ d" tools/autoconf.c || die
-}
-
-src_compile() {
- if use ipv6; then
- rm -f tools/chkipv6.c || die
- fi
-
- if use ssl; then
- rm -f tools/chkssl.c || die
- fi
-
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin psybnc
-
- insinto /usr/share/psybnc
- doins -r help lang salt.h
- fperms 0600 /usr/share/psybnc/salt.h
-
- insinto /etc/psybnc
- doins "${FILESDIR}"/psybnc.conf
-
- keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
- dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
- dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help
-
- fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts}
/etc/psybnc/psybnc.conf
- fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
- fperms 0640 /etc/psybnc/psybnc.conf
-
- if use ssl; then
- keepdir /etc/psybnc/ssl
- dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key
- else
- # Drop SSL listener from psybnc.conf
- sed -i -e "/^# Default SSL listener$/,+4 d"
"${D}"/etc/psybnc/psybnc.conf || die
- fi
-
- if use oidentd; then
- insinto /etc
- doins "${FILESDIR}"/oidentd.conf.psybnc
- fperms 640 /etc/oidentd.conf.psybnc
- # Install init-script with oidentd-support
- newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
- else
- # Install init-script without oidentd-support
- newinitd "${FILESDIR}"/psybnc.initd psybnc
- fi
-
- newconfd "${FILESDIR}"/psybnc.confd psybnc
-
- dodoc
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: 4de9d1fd88dfda82a108b106f0db4bec93f49971
Author: Sam James gentoo org>
AuthorDate: Mon Oct 24 12:30:17 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 24 12:30:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de9d1fd
net-irc/psybnc: fix USE=scripting
Closes: https://bugs.gentoo.org/878159
Signed-off-by: Sam James gentoo.org>
net-irc/psybnc/psybnc-2.4.3.ebuild | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-irc/psybnc/psybnc-2.4.3.ebuild
b/net-irc/psybnc/psybnc-2.4.3.ebuild
index b1d13c41d580..e4b61275e275 100644
--- a/net-irc/psybnc/psybnc-2.4.3.ebuild
+++ b/net-irc/psybnc/psybnc-2.4.3.ebuild
@@ -111,9 +111,13 @@ src_install() {
newinitd "${FILESDIR}"/psybnc.initd psybnc
fi
+ if use scripting ; then
+ dodoc SCRIPTING
+ fi
+
newconfd "${FILESDIR}"/psybnc.confd psybnc
- dodoc CHANGES FAQ README SCRIPTING TODO
+ dodoc CHANGES FAQ README TODO
docinto example-script
dodoc scripts/example/DEFAULT.SCRIPT
}
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/files/, net-irc/psybnc/
commit: d91b772cb89aadf1ee8d66f9711ea1220297658d
Author: Sam James gentoo org>
AuthorDate: Mon Oct 24 11:46:29 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 24 11:46:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91b772c
net-irc/psybnc: rename patches
Signed-off-by: Sam James gentoo.org>
net-irc/psybnc/Manifest| 1 +
.../{compile.diff => psybnc-2.3.2.9-compile.patch} | 0
...-fix.patch => psybnc-2.3.2.9-ldflags-fix.patch} | 0
net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild| 26 --
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/net-irc/psybnc/Manifest b/net-irc/psybnc/Manifest
index 7feaa0cb2399..9ff638d4d120 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -1 +1,2 @@
DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B
0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64
SHA512
b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
+DIST psyBNC-2.4.3.tar.gz 1108733 BLAKE2B
e0f02cab97b503301db0a4c111497e4f99b75d8d2c798b2b5d97997a4c4921d8a7de8dabad79c1291fa4b7efce0d1ed0c7dede1345b155561bb6ce6033b591bb
SHA512
02228baef6fa889d5e12bfa715facc2eab3b033c01b1f799a1c6c995ef9eedfacf3ed328c875f52595d64c47124c20e4145288b2636182dea17ec9027d367bb7
diff --git a/net-irc/psybnc/files/compile.diff
b/net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
similarity index 100%
rename from net-irc/psybnc/files/compile.diff
rename to net-irc/psybnc/files/psybnc-2.3.2.9-compile.patch
diff --git a/net-irc/psybnc/files/ldflags-fix.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
similarity index 100%
rename from net-irc/psybnc/files/ldflags-fix.patch
rename to net-irc/psybnc/files/psybnc-2.3.2.9-ldflags-fix.patch
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index 001c32520db9..684b08d88a1f 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -11,7 +11,7 @@ PSYBNC_HOME="/var/lib/psybnc"
DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
HOMEPAGE="http://www.psybnc.at/index.html;
SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"/${PN}
LICENSE="GPL-2"
SLOT="0"
@@ -26,6 +26,11 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.2.9-compile.patch
+ "${FILESDIR}"/${PN}-2.3.2.9-ldflags-fix.patch
+)
+
src_unpack() {
unpack ${A}
cd "${S}" || die
@@ -45,17 +50,14 @@ src_unpack() {
src_prepare() {
default
- eapply "${FILESDIR}/compile.diff"
- eapply "${FILESDIR}/ldflags-fix.patch"
-
- # add oidentd
- use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
+ # Add oidentd
+ use oidentd && PATCHES+=( "${FILESDIR}"/${P}-oidentd.patch )
- # add scripting support
- use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
+ # Add scripting support
+ use scripting && PATCHES+=( "${FILESDIR}"/${P}-scripting.patch )
- # add multinetwork support
- use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
+ # Add multinetwork support
+ use multinetwork && PATCHES+=( "${FILESDIR}"/${P}-multinetwork.patch )
# Prevent stripping the binary
sed -i -e "/@strip/ d" tools/autoconf.c || die
@@ -103,10 +105,10 @@ src_install() {
insinto /etc
doins "${FILESDIR}"/oidentd.conf.psybnc
fperms 640 /etc/oidentd.conf.psybnc
- # install init-script with oidentd-support
+ # Install init-script with oidentd-support
newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
else
- # install init-script without oidentd-support
+ # Install init-script without oidentd-support
newinitd "${FILESDIR}"/psybnc.initd psybnc
fi
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: 3400a7883f129dbf4dc330f934047a72954d03c6
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 23:34:07 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 23:56:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3400a788
net-irc/psybnc: install relative symlinks
Signed-off-by: Mike Gilbert gentoo.org>
net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
index eaa17997c338..001c32520db9 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -84,8 +84,8 @@ src_install() {
doins "${FILESDIR}"/psybnc.conf
keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
- dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
- dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+ dosym ../../../usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+ dosym ../../../usr/share/psybnc/help "${PSYBNC_HOME}"/help
fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts}
/etc/psybnc/psybnc.conf
fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
@@ -93,7 +93,7 @@ src_install() {
if use ssl; then
keepdir /etc/psybnc/ssl
- dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+ dosym ../../../etc/psybnc/ssl "${PSYBNC_HOME}"/key
else
# Drop SSL listener from psybnc.conf
sed -i -e "/^# Default SSL listener$/,+4 d"
"${D}"/etc/psybnc/psybnc.conf || die
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: 91f4b7a9cc08bd8685242030bdafaf8c8f3c9e2d
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Apr 11 20:40:15 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Apr 11 20:52:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f4b7a9
net-irc/psybnc: migrate to GLEP 81
Closes: https://bugs.gentoo.org/781395
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild | 164
1 file changed, 164 insertions(+)
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
new file mode 100644
index 000..eaa17997c33
--- /dev/null
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="$(ver_rs 3 -)"
+PSYBNC_HOME="/var/lib/psybnc"
+
+DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
+HOMEPAGE="http://www.psybnc.at/index.html;
+SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="ipv6 ssl oidentd scripting multinetwork"
+
+DEPEND="
+ acct-group/psybnc
+ acct-user/psybnc
+ ssl? ( >=dev-libs/openssl-0.9.7d:= )
+ oidentd? ( >=net-misc/oidentd-2.0 )
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}" || die
+
+ # Useless files
+ rm -f */INFO || die
+
+ # Pretend we already have a certificate, we generate it in pkg_config
+ touch key/psybnc.cert.pem || die
+
+ if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
+ einfo "Using existing salt.h for password encryption"
+ cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
+ fi
+}
+
+src_prepare() {
+ default
+
+ eapply "${FILESDIR}/compile.diff"
+ eapply "${FILESDIR}/ldflags-fix.patch"
+
+ # add oidentd
+ use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
+
+ # add scripting support
+ use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
+
+ # add multinetwork support
+ use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
+
+ # Prevent stripping the binary
+ sed -i -e "/@strip/ d" tools/autoconf.c || die
+}
+
+src_compile() {
+ if use ipv6; then
+ rm -f tools/chkipv6.c || die
+ fi
+
+ if use ssl; then
+ rm -f tools/chkssl.c || die
+ fi
+
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ dobin psybnc
+
+ insinto /usr/share/psybnc
+ doins -r help lang salt.h
+ fperms 0600 /usr/share/psybnc/salt.h
+
+ insinto /etc/psybnc
+ doins "${FILESDIR}"/psybnc.conf
+
+ keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
+ dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
+ dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
+
+ fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts}
/etc/psybnc/psybnc.conf
+ fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
+ fperms 0640 /etc/psybnc/psybnc.conf
+
+ if use ssl; then
+ keepdir /etc/psybnc/ssl
+ dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
+ else
+ # Drop SSL listener from psybnc.conf
+ sed -i -e "/^# Default SSL listener$/,+4 d"
"${D}"/etc/psybnc/psybnc.conf || die
+ fi
+
+ if use oidentd; then
+ insinto /etc
+ doins "${FILESDIR}"/oidentd.conf.psybnc
+ fperms 640 /etc/oidentd.conf.psybnc
+ # install init-script with oidentd-support
+ newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
+ else
+ # install init-script without oidentd-support
+ newinitd "${FILESDIR}"/psybnc.initd psybnc
+ fi
+
+ newconfd "${FILESDIR}"/psybnc.confd psybnc
+
+ dodoc CHANGES FAQ README SCRIPTING TODO
+ docinto example-script
+ dodoc scripts/example/DEFAULT.SCRIPT
+}
+
+pkg_config() {
+ if use ssl; then
+ if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f
"${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then
+ ewarn "Existing /etc/psybnc/psybnc.cert.pem or
/etc/psybnc/psybnc.key.pem found!"
+ ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge
--config =${CATEGORY}/${PF} again."
+ return
+ fi
+
+ einfo "Generating certificate request..."
+ openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
+ -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
|| die
+
+ einfo "Generating self-signed certificate..."
+
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: ccf77485fc1789d5ce706feaed6948344acb5195
Author: Conrad Kostecki gentoo org>
AuthorDate: Sun Apr 11 20:41:20 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Sun Apr 11 20:52:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf77485
net-irc/psybnc: drop old version
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Conrad Kostecki gentoo.org>
net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild | 167
1 file changed, 167 deletions(-)
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
deleted file mode 100644
index 5a3deaeb55f..000
--- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-MY_PV="$(ver_rs 3 -)"
-PSYBNC_HOME="/var/lib/psybnc"
-
-DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
-HOMEPAGE="http://www.psybnc.at/index.html;
-SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="ipv6 ssl oidentd scripting multinetwork"
-
-DEPEND="
- ssl? ( >=dev-libs/openssl-0.9.7d:= )
- oidentd? ( >=net-misc/oidentd-2.0 )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- enewgroup psybnc
- enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
-
- # Useless files
- rm -f */INFO || die
-
- # Pretend we already have a certificate, we generate it in pkg_config
- touch key/psybnc.cert.pem || die
-
- if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
- einfo "Using existing salt.h for password encryption"
- cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
- fi
-}
-
-src_prepare() {
- default
-
- eapply "${FILESDIR}/compile.diff"
- eapply "${FILESDIR}/ldflags-fix.patch"
-
- # add oidentd
- use oidentd && eapply "${FILESDIR}/${P}-oidentd.patch"
-
- # add scripting support
- use scripting && eapply "${FILESDIR}/${P}-scripting.patch"
-
- # add multinetwork support
- use multinetwork && eapply "${FILESDIR}/${P}-multinetwork.patch"
-
- # Prevent stripping the binary
- sed -i -e "/@strip/ d" tools/autoconf.c || die
-}
-
-src_compile() {
- if use ipv6; then
- rm -f tools/chkipv6.c || die
- fi
-
- if use ssl; then
- rm -f tools/chkssl.c || die
- fi
-
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- dobin psybnc
-
- insinto /usr/share/psybnc
- doins -r help lang salt.h
- fperms 0600 /usr/share/psybnc/salt.h
-
- insinto /etc/psybnc
- doins "${FILESDIR}"/psybnc.conf
-
- keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
- dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
- dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
-
- fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts}
/etc/psybnc/psybnc.conf
- fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
- fperms 0640 /etc/psybnc/psybnc.conf
-
- if use ssl; then
- keepdir /etc/psybnc/ssl
- dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
- else
- # Drop SSL listener from psybnc.conf
- sed -i -e "/^# Default SSL listener$/,+4 d"
"${D}"/etc/psybnc/psybnc.conf || die
- fi
-
- if use oidentd; then
- insinto /etc
- doins "${FILESDIR}"/oidentd.conf.psybnc
- fperms 640 /etc/oidentd.conf.psybnc
- # install init-script with oidentd-support
- newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
- else
- # install init-script without oidentd-support
- newinitd "${FILESDIR}"/psybnc.initd psybnc
- fi
-
- newconfd "${FILESDIR}"/psybnc.confd psybnc
-
- dodoc CHANGES FAQ README SCRIPTING TODO
- docinto example-script
- dodoc scripts/example/DEFAULT.SCRIPT
-}
-
-pkg_config() {
- if use ssl; then
- if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f
"${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then
- ewarn "Existing /etc/psybnc/psybnc.cert.pem or
/etc/psybnc/psybnc.key.pem found!"
- ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge
--config =${CATEGORY}/${PF} again."
- return
- fi
-
- einfo "Generating certificate request..."
- openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
- -keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
|| die
-
- einfo "Generating self-signed certificate..."
-
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: b09cb12d8eaf6c08054b42f67730a84a4b23aa66
Author: Sam James gentoo org>
AuthorDate: Wed Mar 10 00:42:26 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Mar 10 00:42:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b09cb12d
net-irc/psybnc: modernise, fix invalid EROOT in src_*
Signed-off-by: Sam James gentoo.org>
net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild | 32
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
index b6593d48d19..5a3deaeb55f 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,16 +11,18 @@ PSYBNC_HOME="/var/lib/psybnc"
DESCRIPTION="A multi-user and multi-server gateway to IRC networks"
HOMEPAGE="http://www.psybnc.at/index.html;
SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
+S="${WORKDIR}/${PN}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE="ipv6 ssl oidentd scripting multinetwork"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
- oidentd? ( >=net-misc/oidentd-2.0 )"
+DEPEND="
+ ssl? ( >=dev-libs/openssl-0.9.7d:= )
+ oidentd? ( >=net-misc/oidentd-2.0 )
+"
RDEPEND="${DEPEND}"
-S="${WORKDIR}"/"${PN}"
pkg_setup() {
enewgroup psybnc
@@ -37,14 +39,15 @@ src_unpack() {
# Pretend we already have a certificate, we generate it in pkg_config
touch key/psybnc.cert.pem || die
- if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]; then
+ if [[ -f "${EPREFIX}"/usr/share/psybnc/salt.h ]]; then
einfo "Using existing salt.h for password encryption"
- cp "${ROOT}"/usr/share/psybnc/salt.h salt.h || die
+ cp "${EPREFIX}"/usr/share/psybnc/salt.h salt.h || die
fi
}
src_prepare() {
default
+
eapply "${FILESDIR}/compile.diff"
eapply "${FILESDIR}/ldflags-fix.patch"
@@ -65,6 +68,7 @@ src_compile() {
if use ipv6; then
rm -f tools/chkipv6.c || die
fi
+
if use ssl; then
rm -f tools/chkssl.c || die
fi
@@ -118,7 +122,7 @@ src_install() {
pkg_config() {
if use ssl; then
- if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f
${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]; then
+ if [[ -f "${EROOT}"/etc/psybnc/ssl/psybnc.cert.pem || -f
"${EROOT}"/etc/psybnc/ssl/psybnc.key.pem ]]; then
ewarn "Existing /etc/psybnc/psybnc.cert.pem or
/etc/psybnc/psybnc.key.pem found!"
ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge
--config =${CATEGORY}/${PF} again."
return
@@ -127,10 +131,12 @@ pkg_config() {
einfo "Generating certificate request..."
openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
-keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
|| die
+
einfo "Generating self-signed certificate..."
openssl req -x509 -days 365 -in
"${ROOT}"/etc/psybnc/ssl/psybnc.req.pem \
-key "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem \
-out "${ROOT}"/etc/psybnc/ssl/psybnc.cert.pem || die
+
einfo "Setting permissions on files..."
chown root:psybnc
"${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem || die
chmod 0640 "${ROOT}"/etc/psybnc/ssl/psybnc.{cert,key,req}.pem
|| die
@@ -140,20 +146,22 @@ pkg_config() {
pkg_postinst() {
if use ssl; then
elog
- elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to
create needed SSL certificates."
+ elog "Please run \"emerge --config =${CATEGORY}/${PF}\" to
create the needed SSL certificates."
fi
+
if use oidentd; then
elog
elog "You have enabled oidentd-support. You will need to set"
- elog "up your /etc/oident.conf file before running psybnc. An
example"
- elog "for psyBNC can be found under /etc/oidentd.conf.psybnc"
+ elog "up your ${EROOT}/etc/oident.conf file before running
psybnc. An example"
+ elog "for psyBNC can be found under
${EROOT}/etc/oidentd.conf.psybnc"
fi
+
elog
elog "You can connect to psyBNC on port 23998 with user gentoo and
password gentoo."
- elog "Please edit the psyBNC configuration at /etc/psybnc/psybnc.conf
to change this."
+ elog "Please edit the psyBNC configuration at
${EROOT}/etc/psybnc/psybnc.conf to change this."
elog
elog "To be able to reuse an existing psybnc.conf, you need to make
sure that
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: bc8241db816e13aee2c2e7e7eeacb84221df1579 Author: Sam James gentoo org> AuthorDate: Sun Aug 30 05:45:08 2020 + Commit: Sam James gentoo org> CommitDate: Sun Aug 30 05:45:08 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc8241db net-irc/psybnc: fix RedundantLongDescription Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> net-irc/psybnc/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml index 403e7c957a6..cb2540fa567 100644 --- a/net-irc/psybnc/metadata.xml +++ b/net-irc/psybnc/metadata.xml @@ -7,5 +7,4 @@ Adds scripting support Adds support for multiple networks - psyBNC is a multi-user and multi-server gateway to IRC networks
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: e8b7e1c1a36b3f9b915fecc3fd976c61a9a8db92
Author: Aaron Bauman gentoo org>
AuthorDate: Sat Oct 6 17:45:01 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Oct 6 17:45:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8b7e1c1
net-irc/psybnc: drop old EAPI
Signed-off-by: Aaron Bauman gentoo.org>
net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild | 158
1 file changed, 158 deletions(-)
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
b/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
deleted file mode 100644
index 22fce24e47d..000
--- a/net-irc/psybnc/psybnc-2.3.2.9-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils versionator toolchain-funcs flag-o-matic user
-MY_PV="$(replace_version_separator 3 -)"
-PSYBNC_HOME="/var/lib/psybnc"
-
-DESCRIPTION="psyBNC is a multi-user and multi-server gateway to IRC networks"
-HOMEPAGE="http://www.psybnc.at/index.html;
-SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
-IUSE="ipv6 ssl oidentd scripting multinetwork"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
- oidentd? ( >=net-misc/oidentd-2.0 )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}"/"${PN}"
-
-pkg_setup() {
- enewgroup psybnc
- enewuser psybnc -1 -1 ${PSYBNC_HOME} psybnc
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # Useless files
- rm -f */INFO
-
- # Pretend we already have a certificate, we generate it in pkg_config
- mkdir key
- touch key/psybnc.cert.pem
-
- if [[ -f ${ROOT}/usr/share/psybnc/salt.h ]]
- then
- einfo "Using existing salt.h for password encryption"
- cp "${ROOT}"/usr/share/psybnc/salt.h salt.h
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/compile.diff"
- epatch "${FILESDIR}/ldflags-fix.patch"
-
- # add oidentd
- use oidentd && epatch "${FILESDIR}/${P}-oidentd.patch"
-
- # add scripting support
- use scripting && epatch "${FILESDIR}/${P}-scripting.patch"
-
- # add multinetwork support
- use multinetwork && epatch "${FILESDIR}/${P}-multinetwork.patch"
-
- # Prevent stripping the binary
- sed -i -e "/@strip/ d" tools/autoconf.c
-}
-
-src_compile() {
- use ipv6 || rm -f tools/chkipv6.c
- use ssl || rm -f tools/chkssl.c
-
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
"emake failed"
-}
-
-src_install() {
- dobin psybnc
-
- insinto /usr/share/psybnc
- doins -r help lang salt.h
- fperms 0600 /usr/share/psybnc/salt.h
-
- insinto /etc/psybnc
- doins "${FILESDIR}"/psybnc.conf
-
- keepdir "${PSYBNC_HOME}"/{log,motd,scripts}
- dosym /usr/share/psybnc/lang "${PSYBNC_HOME}"/lang
- dosym /usr/share/psybnc/help "${PSYBNC_HOME}"/help
-
- fowners psybnc:psybnc "${PSYBNC_HOME}"/{,log,motd,scripts}
/etc/psybnc/psybnc.conf
- fperms 0750 "${PSYBNC_HOME}"/{,log,motd,scripts}
- fperms 0640 /etc/psybnc/psybnc.conf
-
- if use ssl
- then
- keepdir /etc/psybnc/ssl
- dosym /etc/psybnc/ssl "${PSYBNC_HOME}"/key
- else
- # Drop SSL listener from psybnc.conf
- sed -i -e "/^# Default SSL listener$/,+4 d"
"${D}"/etc/psybnc/psybnc.conf
- fi
-
- if use oidentd
- then
- insinto /etc
- doins "${FILESDIR}"/oidentd.conf.psybnc
- fperms 640 /etc/oidentd.conf.psybnc
- # install init-script with oidentd-support
- newinitd "${FILESDIR}"/psybnc-oidentd.initd psybnc
- else
- # install init-script without oidentd-support
- newinitd "${FILESDIR}"/psybnc.initd psybnc
- fi
-
- newconfd "${FILESDIR}"/psybnc.confd psybnc
-
- dodoc CHANGES FAQ README SCRIPTING TODO
- docinto example-script
- dodoc scripts/example/DEFAULT.SCRIPT
-}
-
-pkg_config() {
- if use ssl
- then
- if [[ -f ${ROOT}/etc/psybnc/ssl/psybnc.cert.pem || -f
${ROOT}/etc/psybnc/ssl/psybnc.key.pem ]]
- then
- ewarn "Existing /etc/psybnc/psybnc.cert.pem or
/etc/psybnc/psybnc.key.pem found!"
- ewarn "Remove /etc/psybnc/psybnc.*.pem and run emerge
--config =${CATEGORY}/${PF} again."
- return
- fi
-
- einfo "Generating certificate request..."
- openssl req -new -out "${ROOT}"/etc/psybnc/ssl/psybnc.req.pem
-keyout "${ROOT}"/etc/psybnc/ssl/psybnc.key.pem -nodes
- einfo "Generating self-signed certificate..."
- openssl req -x509 -days 365 -in
"${ROOT}"/etc/psybnc/ssl/psybnc.req.pem -key
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/files/, net-irc/psybnc/
commit: 2c032948f9de88cae579a5e6a12705cce59f6ce5
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Fri Sep 21 18:36:08 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Sep 27 21:26:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c032948
net-irc/psybnc: EAPI7, improve ebuild.
Closes: https://bugs.gentoo.org/666720
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/9937
net-irc/psybnc/files/compile.diff | 30 ++--
.../psybnc/files/psybnc-2.3.2.9-multinetwork.patch | 4 +-
net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch | 4 +-
.../psybnc/files/psybnc-2.3.2.9-scripting.patch| 4 +-
net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild| 159 +
5 files changed, 180 insertions(+), 21 deletions(-)
diff --git a/net-irc/psybnc/files/compile.diff
b/net-irc/psybnc/files/compile.diff
index fdee75c6073..99e55b6d8cd 100644
--- a/net-irc/psybnc/files/compile.diff
+++ b/net-irc/psybnc/files/compile.diff
@@ -1,6 +1,6 @@
-diff -Naurp src/p_blowfish.c src/p_blowfish.c
src/p_blowfish.c 2007-02-26 12:16:53.0 +
-+++ src/p_blowfish.c 2007-02-26 12:17:11.0 +
+diff -Naurp a/src/p_blowfish.c b/src/p_blowfish.c
+--- a/src/p_blowfish.c 2007-02-26 12:16:53.0 +
b/src/p_blowfish.c 2007-02-26 12:17:11.0 +
@@ -31,7 +31,7 @@ static char rcsid[] = "@(#)# $Id$
#include
#include
@@ -10,9 +10,9 @@ diff -Naurp src/p_blowfish.c src/p_blowfish.c
char *lngtxt(int msgnum);
#define pcontext {
strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc));
cline=__LINE__; }
-diff -Naurp src/p_global.h src/p_global.h
src/p_global.h 2007-02-26 12:16:53.0 +
-+++ src/p_global.h 2007-02-26 12:17:11.0 +
+diff -Naurp a/src/p_global.h b/src/p_global.h
+--- a/src/p_global.h 2007-02-26 12:16:53.0 +
b/src/p_global.h 2007-02-26 12:17:11.0 +
@@ -972,8 +972,8 @@ int checklogging(int usern);
#endif
@@ -33,9 +33,9 @@ diff -Naurp src/p_global.h src/p_global.h
int strmncasecmp(char *one, char *two);
int strmcmp(char *one, char *two);
int strmwildcmp(char *line, char *wildcard);
-diff -Naurp src/p_memory.c src/p_memory.c
src/p_memory.c 2007-02-26 12:16:53.0 +
-+++ src/p_memory.c 2007-02-26 12:17:11.0 +
+diff -Naurp a/src/p_memory.c b/src/p_memory.c
+--- a/src/p_memory.c 2007-02-26 12:16:53.0 +
b/src/p_memory.c 2007-02-26 12:17:11.0 +
@@ -32,7 +32,7 @@ FILE *logm=NULL;
/* malloc-wrapper. No memory will log an error entry and kill the bouncer */
@@ -54,9 +54,9 @@ diff -Naurp src/p_memory.c src/p_memory.c
{
#ifdef LOGALLOC
if(logm==NULL)
-diff -Naurp src/p_string.c src/p_string.c
src/p_string.c 2007-02-26 12:16:53.0 +
-+++ src/p_string.c 2007-02-26 12:17:11.0 +
+diff -Naurp a/src/p_string.c b/src/p_string.c
+--- a/src/p_string.c 2007-02-26 12:16:53.0 +
b/src/p_string.c 2007-02-26 12:17:11.0 +
@@ -51,7 +51,7 @@ char *lngtxt(unsigned int msgnum)
/* string copy with len and zero delimit */
@@ -66,9 +66,9 @@ diff -Naurp src/p_string.c src/p_string.c
{
char bf[strlen(source)+2];
char *pt;
-diff -Naurp src/match.c src/match.c
src/match.c2007-02-26 12:26:10.0 +
-+++ src/match.c2007-02-26 12:26:17.0 +
+diff -Naurp a/src/match.c b/src/match.c
+--- a/src/match.c 2007-02-26 12:26:10.0 +
b/src/match.c 2007-02-26 12:26:17.0 +
@@ -36,6 +36,7 @@
/* Remove the next line to use this in IrcII */
#define EGGDROP
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
index 4d796961d6f..b4688d7584c 100644
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-multinetwork.patch
@@ -1,5 +1,5 @@
config.h.orig 2009-06-10 21:30:24.0 +
-+++ config.h 2009-06-10 21:30:39.0 +
+--- a/config.h.orig2009-06-10 21:30:24.0 +
b/config.h 2009-06-10 21:30:39.0 +
@@ -50,6 +50,10 @@
#define BLOCKDNS
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
index fbb4b163e3a..afc0dcfa140 100644
--- a/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
+++ b/net-irc/psybnc/files/psybnc-2.3.2.9-oidentd.patch
@@ -1,5 +1,5 @@
config.h.orig 2008-12-14 20:02:57.0 +
-+++ config.h 2008-12-14 20:03:35.0 +
+--- a/config.h 2008-12-14 20:02:57.0 +
b/config.h 2008-12-14 20:03:35.0 +
@@ -14,6 +14,10 @@
#define TRANSLATE
diff --git a/net-irc/psybnc/files/psybnc-2.3.2.9-scripting.patch
[gentoo-commits] repo/gentoo:master commit in: net-irc/psybnc/
commit: 93d41d054e6c7d1f31aac76ed2285657e160 Author: Pacho Ramos gentoo org> AuthorDate: Tue Mar 13 11:56:05 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Mar 13 11:59:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d41d05 net-irc/psybnc: Update maintainer due to bug #96159 Package-Manager: Portage-2.3.24, Repoman-2.3.6 net-irc/psybnc/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml index fc7667fe932..99886fc47cc 100644 --- a/net-irc/psybnc/metadata.xml +++ b/net-irc/psybnc/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - gurlige...@gentoo.org - Bjarke Istrup Pedersen - Adds support for oidentd Adds scripting support
