[Fwd: apr bug -- WAS Re: [Fwd: Re: devel/subversion status]]

2009-06-08 Thread Philip M. Gollucci


--

1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354
Consultant  - P6M7G8 Inc.http://p6m7g8.net
Senior Sys Admin- RideCharge, Inc.   http://ridecharge.com
Contractor  - PositiveEnergyUSA  http://positiveenergyusa.com
ASF Member  - Apache Software Foundation http://apache.org
FreeBSD Committer   - FreeBSD Foundation http://freebsd.org

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
---BeginMessage---

Philip M. Gollucci wrote:
This looks like its a bug in apr itself, rather then the port, I'm 
currently investigating that.

Okay so I know what it is, but not how to fix it.

apr-util's apu-config changed.  Now its either a bug or subversion hasn't 
caught up yet.


In short, -ldb* is never added to APRUTIL_EXPORT_LIBS
which is used in apu-config - apu-1-config.  Therefore, no 3rd Parties can 
report on it (including subversion)


i.e. subversions configure does this:

SVN_DB_LIBS=${SVN_DB_LIBS-`$apu_config --libs | sed -e 
's/.*\(-ldb[^[:space:]]*\).*/\1/' | $EGREP -- '-ldb[^[:space:]]*'`}




I'm going to have to go to d...@apr to get help with the fix and under what 
happened.  Also I have to go eat/sleep and am busy at the data center tomorrow.


I'm hesistant to revert the change and downgrade apr b/c its a security fix.

On a best case senario, I'd say Thursday is the earliest I could have a fix in 
place.  I defer to portmgr@ on what to do in the meantime.




Currently:

$ grep APRUTIL_EXPORT_LIBS *
apr-util.pc.in:Libs: -L${libdir} -...@aprutil_libname@ @LDADD_ldap@ 
@APRUTIL_EXPORT_LIBS@

apu-config.in:LIBS=@APRUTIL_EXPORT_LIBS@
configure:APRUTIL_EXPORT_LIBS
configure: 
APRUTIL_EXPORT_LIBS=$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \

configure: $APRUTIL_EXPORT_LIBS
configure:  if test x$APRUTIL_EXPORT_LIBS = x; then
configure:test x$silent != xyes  echo   setting APRUTIL_EXPORT_LIBS 
to \$apu_expat_libs\

configure:APRUTIL_EXPORT_LIBS=$apu_expat_libs
configure:  for j in $APRUTIL_EXPORT_LIBS; do
configure:test x$silent != xyes  echo   adding \$i\ to 
APRUTIL_EXPORT_LIBS

configure:APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $i
configure:  if test x$APRUTIL_EXPORT_LIBS = x; then
configure:test x$silent != xyes  echo   setting APRUTIL_EXPORT_LIBS 
to \-liconv\

configure:APRUTIL_EXPORT_LIBS=-liconv
configure:  for j in $APRUTIL_EXPORT_LIBS; do
configure:test x$silent != xyes  echo   adding \$i\ to 
APRUTIL_EXPORT_LIBS

configure:APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $i
configure: APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql 
$LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql 
$LDADD_dbd_freetds $LDADD_dbd_odbc
configure: APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $LDADD_dbm_db 
$LDADD_dbm_gdbm $LDADD_dbm_ndbm

configure: APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $LDADD_ldap
configure.in: 
APRUTIL_EXPORT_LIBS=$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \

configure.in: $APRUTIL_EXPORT_LIBS
configure.in:AC_SUBST(APRUTIL_EXPORT_LIBS)

Previously:
-
$ grep APRUTIL_EXPORT_LIBS *
apr-util.pc.in:Libs: -L${libdir} -...@aprutil_libname@ @LDADD_ldap@ 
@APRUTIL_EXPORT_LIBS@

apu-config.in:LIBS=@APRUTIL_EXPORT_LIBS@
build/dso.m4: APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $LDADD_dbd_pgsql 
$LDADD_dbd_sqlite2 $LDADD_dbd_sqlite3 $LDADD_dbd_oracle $LDADD_dbd_mysql 
$LDADD_dbd_freetds $LDADD_dbd_odbc

build/dso.m4: APRUTIL_EXPORT_LIBS=$APRUTIL_EXPORT_LIBS $LDADD_ldap
build/apu-iconv.m4:  APR_ADDTO(APRUTIL_EXPORT_LIBS,[-liconv])
build/apu-conf.m4:APR_ADDTO(APRUTIL_EXPORT_LIBS, [$apu_expat_libs])
build/dbm.m4:APR_ADDTO(APRUTIL_EXPORT_LIBS,[-lgdbm])
build/dbm.m4:APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_ndbm_lib])
build/dbm.m4:APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l$apu_db_lib])
build/dbm.m4:  APR_ADDTO(APRUTIL_EXPORT_LIBS,[$apu_db_xtra_libs])
configure.in: 
APRUTIL_EXPORT_LIBS=$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \

configure.in: $APRUTIL_EXPORT_LIBS
configure.in:AC_SUBST(APRUTIL_EXPORT_LIBS)
export_vars.sh.in:APRUTIL_EXPORT_LIBS=@APRUTIL_EXPORT_LIBS@

--

1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354
Consultant  - P6M7G8 Inc.http://p6m7g8.net
Senior Sys Admin- RideCharge, Inc.   http://ridecharge.com
Contractor  - PositiveEnergyUSA  http://positiveenergyusa.com
ASF Member  - Apache Software Foundation http://apache.org
FreeBSD Committer   - FreeBSD Foundation http://freebsd.org

Work like 

[Fwd: Re: devel/subversion status]

2009-06-08 Thread Philip M. Gollucci


--

1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354
Consultant  - P6M7G8 Inc.http://p6m7g8.net
Senior Sys Admin- RideCharge, Inc.   http://ridecharge.com
Contractor  - PositiveEnergyUSA  http://positiveenergyusa.com
ASF Member  - Apache Software Foundation http://apache.org
FreeBSD Committer   - FreeBSD Foundation http://freebsd.org

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.
---BeginMessage---

1) WITH_ASVN option clobbers RUN_DEPENDS, Its not bugged, but it is one.
Makefile
@@ -62,7 +62,7 @@
 .endif

 .if defined(WITH_ASVN)
-RUN_DEPENDS=   ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
+RUN_DEPENDS+=  ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=ASVN=
 .else
 PLIST_SUB+=ASVN=@comment 


2) We need to use the bsd.databases.mk subsystem (USE_BDB)
Makefile.common
@@ -54,6 +55,7 @@

 # Default us on
 .if !defined(WITHOUT_BDB)
+USE_DBD=   42+
 PLIST_SUB+=BDB=
 .else
 CONFIGURE_ARGS+=   --without-berkeley-db

3) Apr handling and APR BDB support has been busted since
revision 1.77
date: 2009/01/18 19:43:53;  author: pgollucci;  state: Exp;  lines: +108 -87
of devel/apr

Which is a pointyhat to me for not updating subversion then and its awesome 
the -exp didn't catch it either.


Here's a crack at it, and removes DEPENDS_ARGS which doesn't work anyway.
Makefile.common
@@ -92,21 +94,14 @@
 APU_CONFIG=apu-config
 .endif
 APR_PORT=  ${APACHE_PORT}
-.if !defined(WITHOUT_BDB)
-DEPENDS_ARGS+= WITH_BERKELEYDB=db4
-OPT_NAME=  WITH_BERKELEYDB=(db4|db41|db42)
-.endif
 .else
-LIB_DEPENDS+=  apr-1.3:${PORTSDIR}/devel/apr
+APR_PORT=  devel/apr
+LIB_DEPENDS+=  apr-1.3:${PORTSDIR}/${APR_PORT}
 APR_APU_DIR=   ${LOCALBASE}/bin
 APR_CONFIG=apr-1-config
 APU_CONFIG=apu-1-config
-APR_PORT=  devel/apr
-.if !defined(WITHOUT_BDB)
-OPT_NAME=  APR_UTIL_WITH_BERKELEY_DB=yes
-DEPENDS_ARGS+= WITH_BDB=yes
-.endif
 .endif
+
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}


4)WANT_PERL does nothing these days, but thats a larger patch
  to the tree. I relocated MAKE_JOBS_SAFE for consistency

@@ -14,11 +14,11 @@
 DIST_SUBDIR=   subversion
 EXTRACT_ONLY=  ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}

+MAKE_JOBS_SAFE=yes
 USE_BZIP2= yes
 USE_AUTOTOOLS= libtool:15
+
 CONFIGURE_ARGS=--with-ssl
-MAKE_JOBS_SAFE=yes
-WANT_PERL= yes


Essentially then this is the default
  ./configure \
--with-ssl \
--without-swig \
--with-neon=/usr/local \
--without-sasl \
--with-apr=/usr/local/bin/apr-1-config \
--with-apr-util=/usr/local/bin/apu-1-config \
--prefix=/usr/local \

That looks right imho.

Now the only thing left is why configure fails to find bdb after the apr update.

This looks like its a bug in apr itself, rather then the port, I'm currently 
investigating that.


IF we could get a review/test/approval of the above, that would be a good start.



--

1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollu...@p6m7g8.com) c: 703.336.9354
Consultant  - P6M7G8 Inc.http://p6m7g8.net
Senior Sys Admin- RideCharge, Inc.   http://ridecharge.com
Contractor  - PositiveEnergyUSA  http://positiveenergyusa.com
ASF Member  - Apache Software Foundation http://apache.org
FreeBSD Committer   - FreeBSD Foundation http://freebsd.org

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.

---End Message---
___
freebsd-ports@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to freebsd-ports-unsubscr...@freebsd.org