aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 737a28a405..a7c615c69b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-30 Jeffrey Stedfast <fejj@ximian.com>
+
+ * configure.in (nspr_libs): Order the linkline to be the same as
+ the order in Mozilla (it is suggested that they be in this order).
+ (nss_libs): Same.
+
2001-09-27 Dan Winship <danw@ximian.com>
* configure.in: Remove references to the "compose" program, since
diff --git a/configure.in b/configure.in
index 48836f4b7e..b2b5051641 100644
--- a/configure.in
+++ b/configure.in
@@ -801,7 +801,7 @@ if test "x${with_nspr_libs}" != "xno" -a "x${have_nspr_includes}" != "xno"; then
CFLAGS_save="$CFLAGS"
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4 -lplc4 -lplds4 $PTHREAD_LIB"
+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
AC_CACHE_CHECK([for Mozilla nspr libraries], moz_nspr_libs,
[
CFLAGS="$CFLAGS $NSPR_CFLAGS"
@@ -865,8 +865,8 @@ msg_nss="no"
if test "x${with_nss_libs}" != "xno" -a "x${have_nss_includes}" != "xno"; then
LDFLAGS_save="$LDFLAGS"
- nsprlibs="-lnspr4 -lplc4 -lplds4 $PTHREAD_LIB"
- nsslibs="-lnss3 -lssl3 -lsmime3"
+ nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+ nsslibs="-lssl3 -lsmime3 -lnss3"
AC_CACHE_CHECK([for Mozilla nss libraries], moz_nss_libs,
[
LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
8 20:55:56 +0800'>2005-09-282-1/+4 * - Update to 2.5-STABLE11garga2005-09-234-114/+22 * Update the NTLM-scheme patch to version 2. The first version of the patch ispav2005-09-172-4/+4 * - Integrate the following vendor patches:pav2005-09-163-31/+23 * - Remove dependencies on security/pf, it was removed. pf is in base sincepav2005-09-151-4/+1 * - Fix somewhat messed up titles in FTP listings (squid bug #1220)sem2005-09-042-3/+54 * - Update transparent patch.flz2005-07-012-4/+4 * Update the chroot vendor patch to version 2, cfjylefort2005-06-302-4/+4 * - Integrate the following vendor patches as published onahze2005-06-283-16/+38 * - Read cachemgr.conf rather than cachemgr.conf.defaultjylefort2005-05-222-12/+6 * - Update Squid to 2.5.STABLE10pav2005-05-195-85/+28 * - update distinfo for the updated syslog patchvs2005-04-272-31/+2 * - Update distinfo for the 2GB patch, this includes a fix forleeym2005-04-211-1/+1 * - according web page, the patch file is rerolled at 2005-04-20 14:59 againleeym2005-04-211-2/+2 * - the patch is repacked at 2005-04-18 00:57, after maintainer submit PR 80028leeym2005-04-181-2/+2 * Integrate the following vendor patches as published onleeym2005-04-183-2/+62 * - Chase checksum of the updated pid_t patchahze2005-03-162-3/+3 * - Integrate the following vendor patches as published onahze2005-03-142-11/+47 * Integrate the following vendor patches as published onpav2005-03-092-1/+13 * - Update to 2.5.STABLE9pav2005-02-262-20/+5 * * Vendor patches:pav2005-02-212-1/+14 * - Update to 2.5-STABLE8sem2005-02-143-224/+7 * - Update header_parsing.patchpav2005-02-113-36/+3 * Integrate the following vendor patch as published onnectar2005-02-082-2/+20 * - Fix fetching.sem2005-02-012-3/+3 * - Integrate a vendor patch against a buffer overflow in the WCCP handling,sem2005-01-302-2/+5 * Sync follow-XFF with the latest vendor patch.krion2005-01-291-5/+5 * - Integrate vendor patches as published onsem2005-01-274-42/+213 * [Maintainer/security] www/squid: protect against HTTP resonse splitedwin2005-01-222-2/+11 * [Maintainer/Security] www/squid: integrate vendor patchesedwin2005-01-192-2/+11 * - Integrate vendor patches as published onsimon2005-01-132-4/+20 * Patch was rerolled because of some bug fixes.krion2004-12-291-2/+2 * Handle empty ACL definitions properly.krion2004-12-232-2/+5 * Integrate the following vendor patches as published onsem2004-12-092-2/+11 * - fix shutting down of helper applications on reconfigure orkrion2004-11-142-2/+8 * - Integrate the following vendor patches:sergei2004-10-272-2/+8 * - Integrate a vendor patch that prevents squid from consuming 100%sergei2004-10-193-15/+20 * - Update to 2.5-STABLE7; this release fixes a security issue regardingsergei2004-10-135-103/+26 * - Unbreak fetching squid again:sergei2004-10-112-3/+3 * - Unbreak fetching:sergei2004-10-072-2/+2 * Implement vendor patches for the following issues:sem2004-09-025-72/+93 * Integrate vendor patches for the following issues:sem2004-08-292-2/+11 * Fix grammatical and whitespace errors in squid.conf.default.krion2004-08-213-14/+20 * * Integrate a vendor patch for a possible DOS against the NTLMsem2004-08-202-2/+5 * The ldap_helpers patch has been updated again; see squid bugkrion2004-08-121-2/+2 * Integrate new vendor patches:krion2004-08-082-2/+8 * [Maintainer] www/squid: chase re-issued patch, unbreak fetchingedwin2004-07-302-3/+3 * - integrate a new version of the LDAP update patch, thekrion2004-07-292-8/+8 * Fix a bug that disallowed explicit unsetting of the squid_flags variable.ijliao2004-07-281-1/+1 * - Tweaks to RC scriptpav2004-07-262-12/+47 * Remove ldap_helpers.patchsem2004-07-251-2/+0 * Remove squid-2.5.STABLE6-ldap_helpers.patch until it is fixed.eik2004-07-231-1/+0 * The ldap_helpers patch has been rerolled (a missing returnkrion2004-07-222-3/+3 * Integrate the following vendor patches as published onkrion2004-07-202-9/+55 * Update to 2.5-STABLE6krion2004-07-152-113/+42 * Fix the patch that simulates the autotools bootstrap for thekrion2004-06-294-86/+24 * Correct the patch for the NTLM helper vulnerability accordingkrion2004-06-182-23/+12 * - Support systems where pf(4) must be installed from ports (seekrion2004-06-105-14/+42 * Add a couple of patches, including one for a buffer overflow in the NTLMdes2004-06-103-2/+95 * - correct report of available cache memory for cache sizes >2GBkrion2004-06-032-2/+23 * - Add new vendor patches:krion2004-05-022-2/+14 * - Fix plistkrion2004-04-292-6/+6 * - Add a vendor patch to fix an assertion failure that couldkrion2004-04-202-2/+5 * - integrate a vendor patch to fix a segfault that occured whenkrion2004-04-193-13/+23 * - Integrate a vendor patch that fixes an assertion caused bykrion2004-04-122-2/+5 * - Integrate two new vendor patches, please seekrion2004-04-104-13/+32 * - Integrate four new vendor patches applicable to FreeBSD, seepav2004-04-013-4/+26 * - update to squid-2.5.STABLE5, including two vendor patches issued so farsergei2004-03-178-209/+673 * - Integrate a new set of vendor patches, seeeik2004-02-244-167/+35 * - integrate a new patch from squid-cache.org, seesergei2004-02-174-16/+152 * - Update distinfo for the http_workarounds patch (again)sergei2004-02-024-116/+140 * The http_workarounds.patch has been updated, update distinfo accordingly.ijliao2004-01-201-1/+1 * - integrate another patch from squid-cache.org, seeijliao2004-01-193-11/+58 * - configure squid to run under a dedicated "squid" user by default; make usesergei2004-01-178-1017/+419 * - Integrate another patch for the LDAP authentication helpersergei2004-01-102-4/+6 * - Integrate a new patch issued by the squid development teamsergei2004-01-063-2/+16 * Change maintainer to Thomas-Martin Seck.will2004-01-051-1/+1 * More patches for squid, to keep up to date with the squid distribution.edwin2004-01-022-11/+13 * Add more patch files for www/squidedwin2003-12-302-2/+13 * Uncomment the lines I needed to test the port. Mea Culpa.edwin2003-12-281-2/+2 * [PATCH] www/squid: update to 2.5-STABLE4 (+ vendor patches)edwin2003-12-282-4/+56 * [PATCH] www/squid: update to 2.5 STABLE 4edwin2003-12-283-50/+29 * o Allow to use $SQUID_CONFIGURE_ARGS in /etc/make.conf for additionalkuriyama2003-12-131-1/+1 * .. add the missing file.adrian2003-07-271-0/+11 * Massive upgrade to 2.5-stable3. Thanks!adrian2003-07-274-30/+74 * Bring the squid-2.5 port up to 2.5.STABLE2.adrian2003-04-092-139/+3 * Add vendor patches:netchild2003-03-092-4/+139 * Clear moonlight beckons.ade2003-03-072-1/+1 * Grab the patch against squid24 from a PR..adrian2003-01-311-4/+8 * Document the configure argument for reverse SSL proxies.seanc2003-01-031-0/+2 * Removed double USE_PERL5edwin2002-11-051-1/+0 * Half of these ones missed yesterday while converting to USE_REINPLACE.edwin2002-11-051-0/+2 * PERL -> REINPLACEedwin2002-11-041-2/+3 * Update the port to squid-2.5.stable1.adrian2002-10-143-38/+831 * - Use MASTER_SITE_SUBDIR.knu2002-10-141-4/+6 * Update squid port to squid-2.4stable7.adrian2002-07-052-3/+3 * Update the squid24 port to Squid-2.4.STABLE6.adrian2002-03-222-3/+3 * Fix a typo, spotted by des.adrian2002-02-201-1/+1 * Update the port to squid-2.4stable4 .adrian2002-02-192-3/+3 * Update the port to squid-2.4STABLE3.adrian2001-12-032-3/+3 * Remove the RunCache stuff and let squid handle its own child maintainence.adrian2001-09-012-3/+8 * Misc. fixes:olgeni2001-08-311-37/+37 * * Update the port to use the newly-release squid-2.4STABLE2adrian2001-08-292-15/+6 * Make sure we don't delete mime.conf and squid.conf at packageadrian2001-06-182-3/+5 * PR: 26339adrian2001-04-102-2/+4 * Add the latest patch - a HTCP (cache control protocol, not a HTTP extension)adrian2001-04-032-2/+4 * Add some PATCHFILES to this port, and bump its PORTREVISION.adrian2001-03-312-1/+9 * -pthread --> ${PTHREAD_LIBS}sobomax2001-03-301-1/+1 * .. and update the Makefile to indicate that its my port, built by me. :)adrian2001-03-271-3/+3 * PR: 26059adrian2001-03-275-63/+64 * Try to remove ${LOCALBASE}/squid at deinstall time, if it is empty.olgeni2001-03-131-0/+3 * Fix typo: othervise -> otherwise.olgeni2001-02-191-1/+1 * Some spaces -> tabs for ports/www.olgeni2001-02-051-1/+1 * Pass the maintainership bit to adrian (who happens to be a squid committer)peter2001-01-121-1/+1 * Long overdue update. Add some vendor supplied patches.peter2001-01-052-2/+12 * These patches are redundant, and have been for quite some time.peter2001-01-052-33/+0 * Update to the latest 2.3.STABLE4 version plus official patches.sobomax2000-07-284-29/+33 * As threatened on freebsd-ports: all startup scripts know about the twotg2000-07-052-5/+22 * Add an official patch.sobomax2000-06-012-2/+3 * Correct a typo.steve2000-05-301-1/+1 * Update from squid 2.3-stable2 to 2.3-stable3. Unfortunately the newpeter2000-05-172-23/+4 * Update the squid23 port to fix a few loose ends:peter2000-04-182-9/+30 * Update with the new PORTNAME/PORTVERSION variablescpiazza2000-04-101-4/+4 * Remove NO_LATEST_LINK - both squid ports had it, which obviously isn'tpeter2000-03-051-1/+0 * Update to squid 2.3-stable2. This has matured enough that it shouldpeter2000-03-052-3/+15 * Update squid2.2-STABLE5 -> squid2.3-STABLE1 after a repo copy frompeter2000-01-303-5/+6 * Update from squid-2.2.STABLE4 -> squid-2.2.STABLE5peter1999-11-112-3/+3 * $Id$ -> $FreeBSD$peter1999-08-311-1/+1 * echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuffmharo1999-08-281-6/+6 * chmod -> ${CHMOD}mharo1999-08-231-2/+2 * Update from 2.2-STABLE3 -> 2.2-STABLE4peter1999-08-082-3/+3 * Don't require interaction on install while PACKAGE_BUILDING.steve1999-06-231-1/+1 * s,/usr/local,${PREFIX},gmharo1999-06-061-3/+3 * Update from squid 2.1 -> 2.2 after repository copy.peter1999-05-243-11/+13 * Yet more WWW: fun.mharo1999-05-031-1/+2 * Update the MASTER_SITES.max1999-04-181-5/+5 * Update from squid 2.0 -> squid 2.1 (after repository copy)peter1998-12-262-16/+11 * Add patches to bring up to 2.0 patchlevel 2peter1998-10-192-3/+7