Changeset - f2a4bd5a7216
[Not reviewed]
default
0 2 2
Nathan Brink (binki) - 14 years ago 2010-11-27 13:11:22
ohnobinki@ohnopublishing.net
net-irc/unrealircd: Added unrealircd-3.2.8.1-r2, which causes unrealircd to be compiled against and use libstrl for strlcpy() and strlcat().

(Portage version: 2.2.0_alpha2-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)
4 files changed with 61 insertions and 7 deletions:
0 comments (0 inline, 0 general)
net-irc/unrealircd/ChangeLog
Show inline comments
 
@@ -2,6 +2,11 @@
 
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
# $Header: /var/cvsroot/gentoo-x86/net-irc/unrealircd/ChangeLog,v 1.70 2008/08/23 01:20:34 cardoe Exp $
 

	
 
  27 Nov 2010; Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
 
  +unrealircd-3.2.8.1-r2.ebuild, +files/unrealircd-3.2.8.1-libstrl.patch:
 
  hg Added unrealircd-3.2.8.1-r2, which causes unrealircd to be compiled
 
  against and use libstrl for strlcpy() and strlcat().
 

	
 
  20 Jun 2010; Nathan Phillip Brink (ohnobinki)
 
  <ohnobinki@ohnopublishing.net> -unrealircd-3.2.8.1.ebuild,
 
  +unrealircd-3.2.8.1-r1.ebuild:
net-irc/unrealircd/Manifest
Show inline comments
 
-----BEGIN PGP SIGNED MESSAGE-----
 
Hash: SHA1
 
Hash: SHA256
 

	
 
AUX unrealircd-3.2.8.1-libstrl.patch 1248 RMD160 5cf26fb8bb2580e12b4326f4ebc33ba1839fd7d4 SHA1 ddb88988f4e61d90353a85aed3194c4ff1d87900 SHA256 9d36e48f952a035f1d97d2c756c9c463ac7b736781e62472eb93ef14ad0db459
 
AUX unrealircd-system-cares-3.2.7.patch 5472 RMD160 d6e817e98b029c6a03e3e49fbcf636eddf6e8c64 SHA1 5b02b22ce79d8c1aa5622e967b974af274c26e3b SHA256 5ad9062bd3b2820476151f84fca810981f094f305d5eb43ca048d3f9de0d7dfe
 
AUX unrealircd-system-cares-3.2.8.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9
 
AUX unrealircd-system-cares.patch 4850 RMD160 6bd9456bda2b1dc233cf7ad97c60c0ee11c1f99b SHA1 e9086146a7031b874e514eb2a22c06b5decb8adf SHA256 e3be39af381c12349355ed44c1bfac1a205a84728d006fd3de3cff0a564ee0d9
 
@@ -9,12 +10,23 @@ AUX unrealircd.confd 499 RMD160 666439c6
 
AUX unrealircd.rc 640 RMD160 186125558866976380eddae397aba4534a088732 SHA1 815d6950ddb79ca86fa8c887a4386ae9ddd58abe SHA256 a1ac6330e573dc5429153de98c9a8619a92d7ae3502a06e47f392dcaf90f2b07
 
DIST Unreal3.2.8.1.tar.gz 2866456 RMD160 c8e76239e33ba170743f2ddae6bc24782064f105 SHA1 363c3c995bb38cf601f409610ce1937a0002c419 SHA256 009add8da68b6fb66608d06302e59fa9fb994f901cbd92e6f4f10963f2077741
 
EBUILD unrealircd-3.2.8.1-r1.ebuild 4830 RMD160 56403bfd13dd56aae5666722396acfbc9aa92b82 SHA1 054baab5e0975c4b92c3bd0ce63795e99a6651ff SHA256 89e2bfda5b13c76543cb4ebb7db0e956317e6a8e70956af186ce4fed38b88fd5
 
MISC ChangeLog 10519 RMD160 5b80b1e3a8262a76da3e3c9bf9808950deded32b SHA1 29d44409ee8dfb3ba167f0007639cc6cee11d90b SHA256 e96be02156a756ba796ac686247e0771fa4d9b7d7f69f5a7cf8e57ad2db4d10a
 
EBUILD unrealircd-3.2.8.1-r2.ebuild 4825 RMD160 802f601225bcbe2d68d3d679dbac3589466e0479 SHA1 7ebeb212d7b40467016212cfe12f98537a287cb3 SHA256 4eabffa9b1b7a6e9bd42ff211f0c170b8441c22fa58fd8f1fab54cdd3dd3a135
 
MISC ChangeLog 10797 RMD160 7424f37ac287303b4d6e5ab50ea12c74f1c0b50e SHA1 572b9919da69476e0b9daf4676b001949dad776e SHA256 46ec3a2a3b1c100a82ca3b2ba72dc6da27c69d266010f039609b3e84ac705463
 
MISC metadata.xml 819 RMD160 4bc4922a0c4f88c0643d018afcdb34679042b100 SHA1 a0bed439fe30b577b0ee95c2c03f45e4f29f70fc SHA256 4f925bcc1a92f89073c936ae9b22ed8749a683fd80f0d40c15ac722f0936e934
 
-----BEGIN PGP SIGNATURE-----
 
Version: GnuPG v2.0.14 (GNU/Linux)
 

	
 
iEYEARECAAYFAkweFpAACgkQni8M22OVw8BwygCfaG5vbjp62ZYk1cNHnLuRmQNo
 
gKMAn3XrnQyX3U4ivgNx5PZJIKS6SS6C
 
=1m5l
 
iQIcBAEBCAAGBQJM8UnKAAoJEHQ6UuhrqBBQKtAQAJgjkgP3qhE357nEv76E/HgC
 
ZfIhnPO1eJcinEi/djZnAeKZHo4aLm3vHhSD9TNSJFpj30E1A2PPKs9rwV31SMfR
 
/nA5FWdlvHO1BNc3q5NXv0TUPrc9TLMLEs4NNDQTf5FT9hKC0UKg3h+UnrIMqHPo
 
JnEzF0fm8ceyodr3aTfY8qppv3Mtj7bRRtfMspY+PZOXi69cLN4NC/nfjLE1obbO
 
zkUgUdbZOyMByTZKiGz9i258LjlNr0Ykiefkx1ciPmQMfK77YUwS4d/ARsadn8qi
 
W+FrdEbUkVQ+yYieGPy/H1HT0UTKqkSlrFZ+XCYM/s6Q63QieYeCPgSyc0xAVREh
 
qRyncwumrSf2cG+hB4SNXJ5l8QY/FhCzgODAUljKr0jpcgg0DLB6zaAeKPblFmrI
 
Jsr+5m/ThnROUK+7c7fASrOyYRlFjsuKjlMe3uQeyCphcA3w47R9xM/OK3Xwz6hi
 
rDEXZfjvoZfgRI+Ihjf8yuWP0h5zoq376lxJi49riKSZ3CnK3XRO3ZzaM5ntT0G6
 
JiZAtwNRTr2I700U8FjcSwwaHJOcfVmgMOrLhZO5YnMaZs21kDJpotOpO6yV8q0c
 
nO7vmgFRYlWFiL9+m6GGKKikdWcDXRIwa2zoHYbTBj3pdAIptHN0WSchEW3vsxoV
 
Zj8WictTEmfQyIzQLnus
 
=5QHl
 
-----END PGP SIGNATURE-----
net-irc/unrealircd/files/unrealircd-3.2.8.1-libstrl.patch
Show inline comments
 
new file 100644
 
Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
 
Date: 2010/11/27
 

	
 
Use libstrl for the strlcat(), strlcpy(), and strnlen() functions.
 

	
 
--- a/Makefile.in	Sat Nov 27 09:44:06 2010 -0500
 
+++ b/Makefile.in	Sat Nov 27 10:40:23 2010 -0500
 
@@ -34,7 +34,7 @@
 
 #
 
 
 
 #XCFLAGS=-O -g -export-dynamic
 
-IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARES_LIBS@
 
+IRCDLIBS=@IRCDLIBS@ @TRE_LIBS@ @CARES_LIBS@ @LIBSTRL_LIBS@
 
 CRYPTOLIB=@CRYPTOLIB@
 
 OPENSSLINCLUDES=
 
 
 
diff -r 4e2567f3035d -r d3c0a7a3b171 autoconf/configure.in
 
--- a/autoconf/configure.in	Sat Nov 27 09:44:06 2010 -0500
 
+++ b/autoconf/configure.in	Sat Nov 27 10:40:23 2010 -0500
 
@@ -261,9 +261,14 @@
 
 AC_FUNC_ALLOCA
 
 AC_CHECK_FUNCS(snprintf,AC_DEFINE(HAVE_SNPRINTF))
 
 AC_CHECK_FUNCS(vsnprintf,AC_DEFINE(HAVE_VSNPRINTF))
 
-AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY))
 
-AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT))
 
 AC_CHECK_FUNCS(strlncat, AC_DEFINE(HAVE_STRLNCAT))
 
+
 
+PKG_CHECK_MODULES([LIBSTRL], [libstrl >= 0.2])
 
+LIBS="$LIBS $LIBSTRL_LIBS"
 
+CFLAGS="$CFLAGS $LIBSTRL_CFLAGS"
 
+AC_DEFINE(HAVE_STRLCPY)
 
+AC_DEFINE(HAVE_STRLCAT)
 
+
 
 AC_CHECK_FUNCS(inet_pton, AC_DEFINE(HAVE_INET_PTON))
 
 AC_CHECK_FUNCS(inet_ntop, AC_DEFINE(HAVE_INET_NTOP))
 
 dnl Check if it supports C99 style variable length arrays
net-irc/unrealircd/unrealircd-3.2.8.1-r2.ebuild
Show inline comments
 
file copied from net-irc/unrealircd/unrealircd-3.2.8.1-r1.ebuild to net-irc/unrealircd/unrealircd-3.2.8.1-r2.ebuild
 
@@ -48,9 +48,10 @@ src_prepare() {
 
		|| die "sed failed"
 

	
 
	# http://bugs.unrealircd.org/view.php?id=3842
 
	epatch "${FILESDIR}"/unrealircd-system-tre.patch || die "epatch failed"
 
	epatch "${FILESDIR}"/unrealircd-system-tre.patch
 
	epatch "${FILESDIR}"/unrealircd-system-cares.patch
 

	
 
	epatch "${FILESDIR}"/unrealircd-system-cares.patch || die "epatch failed"
 
	epatch "${FILESDIR}"/${P}-libstrl.patch
 

	
 
	mv autoconf/configure.in ./ || die
 
	mv autoconf/aclocal.m4 ./acinclude.m4 || die
0 comments (0 inline, 0 general)