From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 19 Mar 2006 04:16:10 +0300 From: "Dmitry V. Levin" To: ALT Devel discussion list Message-ID: <20060319011610.GA5247@basalt.office.altlinux.org> Mail-Followup-To: ALT Devel discussion list References: <20060318194301.4F819B0D92@basalt.office.altlinux.org> <20060318194308.EE1E5B0D99@basalt.office.altlinux.org> <20060318194327.AE331B0DA0@basalt.office.altlinux.org> <20060318194342.015F9B0D94@basalt.office.altlinux.org> <20060318194349.081BEB0D97@basalt.office.altlinux.org> <20060318194408.2AC4BB0D98@basalt.office.altlinux.org> <20060318194408.77305B0D98@basalt.office.altlinux.org> <20060318202519.GB21478@osdn.org.ua> <20060318223227.GB28126@basalt.office.altlinux.org> <20060319002542.GA18430@localhost.localdomain> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="0eh6TmSyL6TZE2Uz" Content-Disposition: inline In-Reply-To: <20060319002542.GA18430@localhost.localdomain> X-fingerprint: FE4C 93AB E19A 2E4C CB5D 3E4E 7CAB E6AC 9E35 361E Subject: Re: [devel] apache-1.3.34rusPL30.22-alt2 X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.7 Precedence: list Reply-To: ALT Devel discussion list List-Id: ALT Devel discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Mar 2006 01:16:10 -0000 Archived-At: List-Archive: List-Post: --0eh6TmSyL6TZE2Uz Content-Type: multipart/mixed; boundary="fdj2RfSjLxBAspz7" Content-Disposition: inline --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Mar 19, 2006 at 03:25:42AM +0300, =E4=C5=CE=C9=D3 =F3=CD=C9=D2=CE= =CF=D7 wrote: [...] > =F0=CF =D0=CF=D7=CF=C4=D5 =CD=CF=C5=CA =D0=CF=D0=D9=D4=CB=C9 =C9=D3=D0=CF= =CC=D8=DA=CF=D7=C1=D4=D8 rpath -- =D7=CF=D4 =CB=C1=CB =D2=C1=DA =CF=CE=C1, = =D3=D5=C4=D1 =D0=CF > =D7=D3=C5=CD=D5, =C9 =CE=C5 =D5=C4=C1=CC=C1=D3=D8. [...] > --- 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 @@ > =20 > lib$(TARGET).ep: lib$(TARGET).$(SHLIB_SUFFIX_NAME) > $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SHLIB_EXPORT) \ > + -Wl,--rpath=3D. \ > -o lib$(TARGET).ep -DSHARED_CORE_TIESTATIC main/http_main.c \ > -L. -l$(TARGET) $(LIBS) > =20 =E5=DD=A3 =C2=D9. =EB=C1=CB =D7=D9 =D3=C5=C2=C5 =D0=D2=C5=C4=D3=D4=C1=D7= =CC=D1=C5=D4=C5 rpath=3D"."? =F0=D2=C1=D7=C9=CC=D8=CE=C1=D1 =D7=C5=D2=D3= =C9=D1 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) build= mark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) > + $(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) build= mark.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) -lm= m -lz -lcrypt -ldl > @if [ ".$(SHLIB_SUFFIX_LIST)" !=3D . ]; then \ > rm -f lib$(TARGET).$(SHLIB_SUFFIX_NAME).*; \ > for suffix in $(SHLIB_SUFFIX_LIST) ""; do \ =FC=D4=CF =CE=C5 portable, =CE=CF =C4=CC=D1 =CE=C1=DE=C1=CC=C1 =D3=C7=CF=C4= =C9=D4=D3=D1. --=20 ldv --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="apache.spec.diff" Content-Transfer-Encoding: quoted-printable --- 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 =20 Patch75: apache-1.3.27-openbsd-tmp.patch +Patch76: apache-1.3.34-alt-makefile.patch =20 Patch80: uneapi.patch # Expat patch @@ -413,6 +414,7 @@ cp $RPM_BUILD_DIR/mod_realip-%mod_realip %endif =20 %patch75 -p1 +%patch76 -p1 =20 #patch90 -p0 =20 @@ -883,6 +885,10 @@ fi # - include /etc/monitrc.d/apache ? =20 %changelog +* Sun Mar 19 2006 Denis Smirnov 1.3.34rusPL30.22-al= t3 +- Fixed building with -Wl,--as-needed. +- Quoted macros in changelog. + * Wed Jan 25 2006 Michael Shigorin 1.3.34rusPL30.22-al= t2 - security fix for CVE-2005-3352: + cross-site scripting (XSS) vulnerability in the mod_imap module of Apa= che @@ -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) =20 * Thu Jun 17 2004 Michael Shigorin 1.3.31rusPL30.20-alt= 4%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=3D1 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) --fdj2RfSjLxBAspz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="apache-1.3.34-alt-makefile.patch" Content-Transfer-Encoding: quoted-printable --- 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=3D\$$ORIGIN =20 lib$(TARGET).$(SHLIB_SUFFIX_NAME): subdirs modules.o $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c - $(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildma= rk.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) + $(LD_SHLIB) $(LDFLAGS_SHLIB) -o lib$(TARGET).$(SHLIB_SUFFIX_NAME) buildma= rk.o $(OBJS) $(REGLIB) $(EXPATLIB) $(LD_SHCORE_DEF) $(LD_SHCORE_LIBS) -lmm = -lz -lcrypt -ldl @if [ ".$(SHLIB_SUFFIX_LIST)" !=3D . ]; then \ rm -f lib$(TARGET).$(SHLIB_SUFFIX_NAME).*; \ for suffix in $(SHLIB_SUFFIX_LIST) ""; do \ --fdj2RfSjLxBAspz7-- --0eh6TmSyL6TZE2Uz Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2.2 (GNU/Linux) iD8DBQFEHLDafKvmrJ41Nh4RAisVAKDHY+IQn7CVp2bCeCqmqToo+kU1YQCgmrYQ VrI83JbNV58B9qeZSz3EH+Y= =8Jq2 -----END PGP SIGNATURE----- --0eh6TmSyL6TZE2Uz--