[devel] apache-1.3.34rusPL30.22-alt2
Dmitry V. Levin
=?iso-8859-1?q?ldv_=CE=C1_altlinux=2Eorg?=
Вс Мар 19 04:16:10 MSK 2006
On Sun, Mar 19, 2006 at 03:25:42AM +0300, Денис Смирнов wrote:
[...]
> По поводу моей попытки использовать rpath -- вот как раз она, судя по
> всему, и не удалась.
[...]
> --- 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)
>
Ещё бы. Как вы себе представляете rpath="."? Правильная версия attached.
> 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 \
Это не portable, но для начала сгодится.
--
ldv
----------- следующая часть -----------
--- apache-1.3.34rusPL30.22-alt2/apache.spec 2006-01-25 12:37:07 +0000
+++ apache-1.3.34rusPL30.22-alt3/apache.spec 2006-03-19 00:45:52 +0000
@@ -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
@@ -111,6 +111,7 @@ Patch9: apache-1.3.33-alt-hardlimit.patc
Patch10: apache-1.3.31-acl-support.patch
Patch75: apache-1.3.27-openbsd-tmp.patch
+Patch76: apache-1.3.34-alt-makefile.patch
Patch80: uneapi.patch
# Expat patch
@@ -413,6 +414,7 @@ cp $RPM_BUILD_DIR/mod_realip-%mod_realip
%endif
%patch75 -p1
+%patch76 -p1
#patch90 -p0
@@ -883,6 +885,10 @@ fi
# - include /etc/monitrc.d/apache ?
%changelog
+* Sun Mar 19 2006 Denis Smirnov <mithraen на altlinux.ru> 1.3.34rusPL30.22-alt3
+- Fixed building with -Wl,--as-needed.
+- Quoted 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 @@ fi
+ 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 @@ fi
- 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 @@ fi
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)
----------- следующая часть -----------
--- apache_1.3.34/src/Makefile.tmpl.orig 2004-11-24 19:10:19 +0000
+++ apache_1.3.34/src/Makefile.tmpl 2006-03-19 00:42:16 +0000
@@ -46,11 +46,11 @@ target_shared: $(SHCORE_IMPLIB) $(SHARED
lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME)
$(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \
-o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \
- -L. -l$(TARGET) $(LIBS)
+ -L. -l$(TARGET) $(LIBS) -Wl,--rpath=\$$ORIGIN
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 \
----------- следующая часть -----------
Было удалено вложение не в текстовом формате...
Имя : =?iso-8859-1?q?=CF=D4=D3=D5=D4=D3=D4=D7=D5=C5=D4?=
Тип : application/pgp-signature
Размер : 191 байтов
Описание: =?iso-8859-1?q?=CF=D4=D3=D5=D4=D3=D4=D7=D5=C5=D4?=
Url : <http://lists.altlinux.org/pipermail/devel/attachments/20060319/a40310e7/attachment-0001.bin>
Подробная информация о списке рассылки Devel