Version bump. Fix building with GCC 4.4 (bug #278154).

Package-Manager: portage-13833-svn/cvs/Linux x86_64

8 files changed, 69 insertions, 219 deletions

diff --git a/www-apache/anyterm/ChangeLog b/www-apache/anyterm/ChangeLog
index c0b0879b886f..d3bc453116be 100644
--- a/www-apache/anyterm/ChangeLog
+++ b/www-apache/anyterm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apache/anyterm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.19 2009/05/31 20:59:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/ChangeLog,v 1.20 2009/07/17 23:48:15 arfrever Exp $
+
+*anyterm-1.1.29 (17 Jul 2009)
+
+  17 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/50_anyterm.conf, -files/anyterm-1.1.15-browser-gentoo.patch,
+  -files/anyterm-1.1.15-postinst-en.txt,
+  -files/anyterm-1.1.22-respect-flags.patch, +anyterm-1.1.29.ebuild,
+  +files/anyterm-1.1.29-gcc-4.4.patch:
+  Version bump. Fix building with GCC 4.4 (bug #278154).
 
   31 May 2009; Markus Meier <maekke@gentoo.org> anyterm-1.1.28.ebuild:
   add ~amd64, bug #265763
diff --git a/www-apache/anyterm/Manifest b/www-apache/anyterm/Manifest
index c71b67b76dd6..1a04e3532f5a 100644
--- a/www-apache/anyterm/Manifest
+++ b/www-apache/anyterm/Manifest
@@ -1,21 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 50_anyterm.conf 98 RMD160 6868b4ac9c930caacdab74a70fff70e1ddadac2d SHA1 7c156d998dd92bc70f687777dca14d2aef663147 SHA256 42f96e8066ff95c0ae51337d460fbf7b5ec24d9c4c0e6114b5ee33f48c6d7ec7
-AUX anyterm-1.1.15-browser-gentoo.patch 2100 RMD160 e3aa724b79bc52fe682864adf819df2ef68f1655 SHA1 8dbf94e35e18fa4375481d51f93c910fe29838a0 SHA256 b7cf110f80e8e18bbb18eff8801dc90f77f9a919439e3c7afce114f3964965c7
-AUX anyterm-1.1.15-postinst-en.txt 1984 RMD160 d372d26bcdbc8e092858306bb51bbe56be082b4b SHA1 e88e548caf193d450002ded43176a86ee31c40a9 SHA256 e193a5d51d121e2f16ca1fa6758029c173997cc9806593e4fffb022fefdc9f48
-AUX anyterm-1.1.22-respect-flags.patch 1818 RMD160 0299dff3775b9fbb7cf35445e94b50fd6db61cd5 SHA1 a08de2faa44f94fe3982b37b4f6b32c4db6e3964 SHA256 6c40f717adcdbdfef62e475d9b29b9629f5c82458d74fb3477a374d856ae8054
 AUX anyterm-1.1.28-respect-LDFLAGS.patch 745 RMD160 134233f272d739f740b27cda2c50a7091febdbd5 SHA1 28af4e11b279808a6e966cacdccf7367b12ebe75 SHA256 c846a2ee0e9722fb478f2fceeb260d457c7f3a16f4160aae7c486752d66a0487
+AUX anyterm-1.1.29-gcc-4.4.patch 182 RMD160 cff9dbdda22eab0e3e692aebd42e295b2eac3032 SHA1 56c1c3c1cd5f0851b73ce52e74108c66675cf592 SHA256 27bd1078b7a4e3bf44f059b531a1aa20ac4f868420a10f834f0ead43989b5119
 AUX anyterm.conf.d 157 RMD160 5da77bf0065b790462c39d77f461001d30e2ebd6 SHA1 185fb8e577aa01904f555eb2fa4c0b2e49b771ad SHA256 c630f4972d3ce3b8236abea1269060e033387a00e9455f36bfb94f02a5f5ec06
 AUX anyterm.init.d 536 RMD160 09d3668e64b99b749d3b86b74b5bc4ff1ea5cc4e SHA1 d146e1de2f9a7f6ddd577b1074bb74ba52e954f2 SHA256 4340a2dc75842290cc270116ba518ce00379ec91f4093a60971d199a348c12d2
 DIST anyterm-1.1.28.tbz2 174508 RMD160 c3b33d0629199c2eee262d5a4f25d85498d408d1 SHA1 955d163a0353c43bdff93ffcadce8c5163d7e809 SHA256 c6e4ba24e125242f35d8977ea293a1863ff5c402e5d538525a711cdd483b404e
+DIST anyterm-1.1.29.tbz2 178424 RMD160 df00cbc2ff5b8b0b97ca82239aab7ed920da3ad7 SHA1 a0403bbffdf4bcc33daa205cb42e02cc7c1fefff SHA256 6e7710cf2240cb4eced295bdf17de4b6ce223c7fe4d1668260a6d60a8aec9846
 EBUILD anyterm-1.1.28.ebuild 1121 RMD160 9e5ffcd4a4106a355e3d900fb75e1f566a308fc4 SHA1 1c9d6b7d0c882dbbfbe40cf4019a37e445ff83bf SHA256 379403056a86a39f1bb6bc22137f006a1eb478426dca78dc336b85b5f13b6044
-MISC ChangeLog 3896 RMD160 6ea418188e6ee6a9945b49750628443da734b81b SHA1 92afa7853aa7690160124ec4f5347210fa1f2f61 SHA256 afd471d5893a974e877b1e5c9ea14f90fb2e52426c025f4a30ca2d522d93131e
+EBUILD anyterm-1.1.29.ebuild 1152 RMD160 f8a06efaacdd48c32a5b93a5a5a94d592b8971bd SHA1 d1897b9ab9c61cbf1522402fb4b246ee497370e1 SHA256 dfb1f8cd7caf7771ab6410c9b23787b14d46098a5b4f5e645d278b8c5872cf37
+MISC ChangeLog 4279 RMD160 0bb90595a895296244e87d0c64421abe34660a78 SHA1 31beb18c00285b8b94732bc71c43cfaf60f474d8 SHA256 8c58dee3ae80bce336f58cf35fdeb9a0769417b55288343f725affb97c482356
 MISC metadata.xml 183 RMD160 0e64ed9d85dd9d4ca990131047e926413a224843 SHA1 c2d94faa8692a93322354d824fd271dcf36afb8f SHA256 b842f68294faf221aa36e479d4275079ec6831ad215f59d3d446de08b410df49
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoi79QACgkQkKaRLQcq0GJdfwCfSY7c7YauErCirNoZB6UiDcaq
-8UEAn09YTk2rms2rm3UZV7mj/QzqbVgl
-=UZfI
------END PGP SIGNATURE-----
diff --git a/www-apache/anyterm/anyterm-1.1.29.ebuild b/www-apache/anyterm/anyterm-1.1.29.ebuild
new file mode 100644
index 000000000000..a06183fb8461
--- /dev/null
+++ b/www-apache/anyterm/anyterm-1.1.29.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/anyterm/anyterm-1.1.29.ebuild,v 1.1 2009/07/17 23:48:15 arfrever Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A terminal anywhere."
+HOMEPAGE="http://anyterm.org/"
+SRC_URI="http://anyterm.org/download/${P}.tbz2"
+
+LICENSE="GPL-2 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/boost-1.34.1
+		virtual/ssh"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.1.28-respect-LDFLAGS.patch"
+	epatch "${FILESDIR}/${P}-gcc-4.4.patch"
+}
+
+src_compile() {
+	# this package uses `ld -r -b binary` and thus resulting executalbe contains
+	# executable stack
+	append-ldflags -Wl,-z,noexecstack
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" || die
+}
+
+src_install() {
+	dosbin anytermd || die
+	dodoc CHANGELOG README || die
+	doman anytermd.1 || die
+	newinitd "${FILESDIR}/anyterm.init.d" anyterm || die
+	newconfd "${FILESDIR}/anyterm.conf.d" anyterm || die
+}
+
+pkg_postinst() {
+	elog "To proceed installation, read following:"
+	elog "http://anyterm.org/1.1/install.html"
+}
diff --git a/www-apache/anyterm/files/50_anyterm.conf b/www-apache/anyterm/files/50_anyterm.conf
deleted file mode 100644
index 3a36d8362862..000000000000
--- a/www-apache/anyterm/files/50_anyterm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine ANYTERM>
-LoadModule anyterm modules/anyterm.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/www-apache/anyterm/files/anyterm-1.1.15-browser-gentoo.patch b/www-apache/anyterm/files/anyterm-1.1.15-browser-gentoo.patch
deleted file mode 100644
index 0b06a5121a30..000000000000
--- a/www-apache/anyterm/files/anyterm-1.1.15-browser-gentoo.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: anyterm-1.1.15/browser/anyterm.js
-===================================================================
---- anyterm-1.1.15.orig/browser/anyterm.js
-+++ anyterm-1.1.15/browser/anyterm.js
-@@ -24,16 +24,21 @@ var term;
- var open=false;
- var session;
- 
--var method="POST";
--//var method="GET";
-+#USE=opera#//var method="POST";
-+#USE=opera#var method="GET";
-+#USE=-opera#var method="POST";
-+#USE=-opera#//var method="GET";
- 
- // Random sequence numbers are needed to prevent Opera from caching
- // replies
- 
- var is_opera = navigator.userAgent.toLowerCase().indexOf("opera") != -1;
--if (is_opera) {
--  method="GET";
--}
-+#USE=opera#if (is_opera) {
-+#USE=opera#  method="GET";
-+#USE=opera#}
-+#USE=-opera#//if (is_opera) {
-+#USE=-opera#//  method="GET";
-+#USE=-opera#//}
- 
- var seqnum_val=Math.round(Math.random()*100000);
- function cachebust() {
-Index: anyterm-1.1.15/browser/.htaccess
-===================================================================
---- anyterm-1.1.15.orig/browser/.htaccess
-+++ anyterm-1.1.15/browser/.htaccess
-@@ -6,6 +6,8 @@
- # will be ignored if the anyterm module has not been loaded.
- 
- <IfModule anyterm>
-+#USE=ssl#<IfModule mod_ssl.c>
-+#USE=pam#<IfModule mod_auth_pam.c>
- 
- # Use an anyterm_command directive to specify the command to run
- # inside the terminal:
-@@ -24,6 +26,16 @@
- # Example:
- # anyterm_command '/path/to/anygetty --remotehost "Anyterm: %h" --autologin=%u'
- 
-+# twp: Use ssh to avoid problems with Gentoo's /bin/login.
-+anyterm_command '/usr/bin/ssh %u@localhost'
-+
-+#USE=ssl#SSLRequireSSL
-+#USE=ssl#
-+#USE=pam#AuthPAM_Enabled on
-+#USE=pam#AuthType Basic
-+#USE=pam#AuthName "Anyterm"
-+#USE=pam#Require valid-user
-+#USE=pam#
- <Files anyterm-module>
-   SetHandler anyterm
- 
-@@ -34,9 +46,12 @@
-   # CustomLog /path/to/logfile combined env=!DONTLOG
-   # See the Apache documentation for details.  Note "=!" not "!=" !
- 
--  # SetEnv DONTLOG
-+#USE=opera#  SetEnv DONTLOG
-+#USE=-opera#  # SetEnv DONTLOG
- </Files>
- 
-+#USE=pam#</IfModule>
-+#USE=ssl#</IfModule>
- # Additional Security Issues
- 
- # If you're just testing Anyterm on a machine that's not connected to
diff --git a/www-apache/anyterm/files/anyterm-1.1.15-postinst-en.txt b/www-apache/anyterm/files/anyterm-1.1.15-postinst-en.txt
deleted file mode 100644
index 19a11013aa2f..000000000000
--- a/www-apache/anyterm/files/anyterm-1.1.15-postinst-en.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-DEFAULT GENTOO INSTALLATION
-
-The default Gentoo installation is designed to work and be as secure as
-possible out-of-the box as long as you have USE="ssl pam -opera".
-
-
-USE FLAGS
-
-+ssl    forces anyterm to only run over secure (HTTPS) connections.
--ssl    disables secure connections, all data will pass over the network in
-        plain text, including passwords!
-+pam    enables PAM authentication, so anyone with an account on your computer
-        can use anyterm without any further configuration.
--pam    means that you will have to configure your own authentication
-        mechanism.
-+opera  Enables a workaround for a bug in the Opera browser, but you will have
-        to modify apache's logging behaviour to prevent snooping by local
-        users.
--opera  Disables the Opera bug workaround.
-
-
-INSTALLATION INSTRUCTIONS
-
-1. Add the following flags to APACHE2_OPTS in /etc/init.d/apache2:
-    -D ANYTERM
-    -D SSL -D SSL_DEFAULT_VHOST  # if USE=ssl
-    -D AUTH_PAM                  # if USE=pam
-
-2. If you have USE=vhosts then you need to add the following directives to
-   each virtual host's configuration file:
-    <Directory "${MY_INSTALLDIR}">
-        AllowOverride All
-    </Directory>
-
-3. If you have USE=opera then you should disable logging of some requests. In
-   each apache configuration file add env=!DONTLOG to each CustomLog
-   directive. For example:
-
-   USE="ssl -vhosts": edit /etc/apache2/modules.d/41_mod_ssl.default-vhost.conf:
-
-   CustomLog logs/ssl_request_log \
-       "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b" \
-       env=!DONTLOG
-
-   USE="-ssl -vhosts": edit /etc/apache2/modules.d/00_mod_log_config.conf:
-       CustomLog logs/access_log common env=!DONTLOG
-
-4. Restart apache2:
-   /etc/init.d/apache2 restart
-
-5. Browse to:
-   https://${VHOST_HOSTNAME}${VHOST_APPDIR}/${PN}.html  # if USE=ssl
-   http://${VHOST_HOSTNAME}${VHOST_APPDIR}/${PN}.html   # if USE=-ssl
-
-
-MORE INFORMATION
-
-http://anyterm.org/
-http://anyterm.org/security.html
diff --git a/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch b/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch
deleted file mode 100644
index 6dae0a41d41a..000000000000
--- a/www-apache/anyterm/files/anyterm-1.1.22-respect-flags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- apachemod/Makefile
-+++ apachemod/Makefile
-@@ -85,7 +85,7 @@
- 	-DUSE_SHMEM \
- 	-I../boost_shmem
- 
--COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall -O0 -g
-+COMPILE_FLAGS=$(CPP_FLAGS) $(shell $(APR_CONFIG) --cflags) -Wall
- 
- C_COMPILE_FLAGS=$(COMPILE_FLAGS) -std=gnu99
- 
-@@ -108,23 +108,23 @@
- OBJS=$(addsuffix .lo,$(basename $(C_SRCS) $(CC_SRCS)))
- 
- %.lo: %.cc
--	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CC_COMPILE_FLAGS) -o $@ -c $<
-+	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CC_COMPILE_FLAGS) -o $@ -c $<
- 
- %.lo: %.c
--	$(LIBTOOL) --mode=compile $(CC) $(C_COMPILE_FLAGS) -o $@ -c $<
-+	$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(C_COMPILE_FLAGS) -o $@ -c $<
- 
- 
- compile: $(OBJS) $(LIBPBE_LIB)
--	$(APXS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
-+	$(APXS) $(LDFLAGS) -c -o anyterm.la $(OBJS) $(LINK_FLAGS)
- 
- install: FORCE
- 	$(APXS) -n anyterm -i anyterm.la
- 
- %.d: %.cc
--	$(CXX) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MM -MG -MT $@ -MT $(<:%.cc=%.lo) $(CPP_FLAGS) -o $@ $<
- 
- %.d: %.c
--	$(CC) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG -MT $@ -MT $(<:%.c=%.lo) $(CPP_FLAGS) -o $@ $<
- 
- DEPENDS=$(addsuffix .d,$(basename $(OBJS)))
- 
---- libpbe/build/Makefile
-+++ libpbe/build/Makefile
-@@ -53,7 +53,7 @@
- 
- WARN_FLAGS=-W -Wall
- 
--OPTIMISE_FLAGS=-O
-+OPTIMISE_FLAGS=
- 
- DEBUG_FLAGS=
- 
-@@ -71,10 +71,10 @@
- 	$(AR) ruv $(LIBRARY) $(OBJS)
- 
- %.o: %.cc
--	$(CXX) $(COMPILE_FLAGS) -c $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMPILE_FLAGS) -c $<
- 
- %.d: %.cc
--	$(CXX) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread -MM -MT $@ -MT $(notdir $(<:%.cc=%.o)) $(INC_FLAGS) -o $@ $<
- 
- all: $(EXECUTABLE)
- 
diff --git a/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch b/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch
new file mode 100644
index 000000000000..3809f5aac186
--- /dev/null
+++ b/www-apache/anyterm/files/anyterm-1.1.29-gcc-4.4.patch
@@ -0,0 +1,10 @@
+--- libpbe/src/SmtpClient.cc
++++ libpbe/src/SmtpClient.cc
+@@ -20,6 +20,7 @@
+ #include "ip.hh"
+ #include "select.hh"
+ 
++#include <stdio.h>
+ #include <syslog.h>
+ #include <unistd.h>
+