Re: [devel] [10 packages]: rebuild failed

["Денис Смирнов" <mithraen@altlinux.ru>]

[-- Attachment #1.1: Type: text/plain, Size: 534 bytes --]

On Sun, Mar 19, 2006 at 01:32:27AM +0300, Dmitry V. Levin wrote:

 DVL> Окажу посильную помощь. :)

Я попробовал пофиксить апача, но уперся в то, что не получается собрать
libhttpd.ep так, чтобы он видел libhttpd.so.

Патчи на спек и на апача в аттаче.

По поводу моей попытки использовать rpath -- вот как раз она, судя по
всему, и не удалась.

-- 
С уважением, Денис

http://freesource.info
----------------------------------------------------------------------------
Наши кодеры - самые кодерастые кодеры в мире!

[-- Attachment #1.2: apache.spec.patch --]
[-- Type: text/plain, Size: 2958 bytes --]

--- apache.spec.orig	2006-01-25 15:37:07 +0300
+++ apache.spec	2006-03-19 00:43:32 +0300
@@ -6,7 +6,7 @@
 %define russian_patchlevel PL30.22
 %define apache_vanilla_version 1.3.34
 %define apache_version %{apache_vanilla_version}rus%russian_patchlevel
-%define apache_release alt2
+%define apache_release alt3
 %define mod_realip_version 2.0
 %define mod_perl_version 1.29
 %define mod_perl_version_pad %{mod_perl_version}00
@@ -122,6 +122,7 @@
 Patch94: apache-1.3.33-fix-htpasswd-buffer.patch
 Patch95: apache-1.3.33-CAN-2005-2088.patch
 Patch96: 907_mod_imap_CVE-2005-3352.patch
+Patch97: apache-alt-linking.patch
 
 # Automatically added by buildreq on Wed May 12 2004 (-bi)
 BuildRequires: libdb1-devel libgdbm-devel libmm-devel perl-BSD-Resource perl-CGI perl-Devel-Symdump perl-HTML-Parser perl-URI perl-devel perl-libwww-perl
@@ -424,6 +425,7 @@
 %patch94 -p1
 #patch95 -p4
 %patch96 -p2
+%patch97 -p0
 
 %__chmod -x $(find htdocs -type f)
 %__perl -pi -e 's|" PLATFORM "|%distribution/%apache_release|;' \
@@ -883,6 +885,10 @@
 # - include /etc/monitrc.d/apache ?
 
 %changelog
+* Sun Mar 19 2006 Denis Smirnov <mithraen@altlinux.ru> 1.3.34rusPL30.22-alt3
+- fix building with -Wl,--as-needed
+- fix macros in changelog
+
 * Wed Jan 25 2006 Michael Shigorin <mike@altlinux.org> 1.3.34rusPL30.22-alt2
 - security fix for CVE-2005-3352:
   + cross-site scripting (XSS) vulnerability in the mod_imap module of Apache
@@ -952,7 +958,7 @@
   + implemented separate TMPDIR (addon modules should follow) (#5989)
   + disabled mod_charset for mod_perl (hm... #2941-related)
   + commented out "AddDefaultCharset iso8859-1" by default (#5754)
-  + added %apache_vhostdir and %apache_vhconfdir (#5634)
+  + added %%apache_vhostdir and %%apache_vhconfdir (#5634)
   + upped HARD_SERVER_LIMIT from 256 to 1024 (#5748; needs additional
     /etc/security/limits.conf tweaking to actually happen)
   + changed %%suexec_docroot from /home to %apache_home (#2461)
@@ -1032,7 +1038,7 @@
 - added mod_deflate to current builds; off by default (#2905)
 - fixed altlinux.html
 - %apache_home/html/*.gif and %apache_home/cgi-bin/* are now
-  %config(noreplace); added %apache_home/html/README.txt (#3715)
+  %%config(noreplace); added %apache_home/html/README.txt (#3715)
 
 * Thu Jun 17 2004 Michael Shigorin <mike@altlinux.ru> 1.3.31rusPL30.20-alt4%release_tag
 - fixed default httpd{-perl,}.conf regarding Ukrainian charsets and content
@@ -1171,7 +1177,7 @@
   updated to 1.3.28 and merged into Patch1)
 - added %%add_findprov_lib_path
 - APACHE_HEADER_INSTALL=1 now (#917, #2373)
-- workaround for careless: %config(noreplace) %apache_home/html/*html*
+- workaround for careless: %%config(noreplace) %apache_home/html/*html*
   (#1067, #2510; see also bug comments for proper solution)
 - fixed includedir substitution for apxs-perl (#1254)
 - *major* revamp of mime.types file (#1331, #2468, #2848)

[-- Attachment #1.3: apache-alt-linking.patch --]
[-- Type: text/plain, Size: 932 bytes --]

--- src/Makefile.tmpl.orig	2004-11-24 22:10:19 +0300
+++ src/Makefile.tmpl	2006-03-19 00:33:09 +0300
@@ -45,12 +45,13 @@
 
 lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
 	$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
+		-Wl,--rpath=. \
 	      -o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \
 		  -L. -l$(TARGET) $(LIBS)
 
 lib$(TARGET).$(SHLIB_SUFFIX_NAME): subdirs modules.o
 	$(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
-	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS)
+	$(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildmark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) -lmm -lz -lcrypt -ldl
 	@if [ ".$(SHLIB_SUFFIX_LIST)" != . ]; then \
 		rm -f lib$(TARGET).$(SHLIB_SUFFIX_NAME).*; \
 		for suffix in $(SHLIB_SUFFIX_LIST) ""; do \

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 191 bytes --]