commit 0a2210eb1a4d55f37f205646055bfd7c3fab1e02 Author: Juergen Daubert <jue@jue.li> Date: Wed Feb 1 10:57:26 2023 +0100 [notify] apr: update to 1.7.1, split off apr-utils diff --git a/apr/.footprint b/apr/.footprint index 8609cd0ee..48207e396 100644 --- a/apr/.footprint +++ b/apr/.footprint @@ -1,20 +1,12 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/apr-1-config --rwxr-xr-x root/root usr/bin/apu-1-config drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/apr-1/ -rw-r--r-- root/root usr/include/apr-1/apr.h -rw-r--r-- root/root usr/include/apr-1/apr_allocator.h --rw-r--r-- root/root usr/include/apr-1/apr_anylock.h -rw-r--r-- root/root usr/include/apr-1/apr_atomic.h --rw-r--r-- root/root usr/include/apr-1/apr_base64.h --rw-r--r-- root/root usr/include/apr-1/apr_buckets.h --rw-r--r-- root/root usr/include/apr-1/apr_crypto.h -rw-r--r-- root/root usr/include/apr-1/apr_cstr.h --rw-r--r-- root/root usr/include/apr-1/apr_date.h --rw-r--r-- root/root usr/include/apr-1/apr_dbd.h --rw-r--r-- root/root usr/include/apr-1/apr_dbm.h -rw-r--r-- root/root usr/include/apr-1/apr_dso.h -rw-r--r-- root/root usr/include/apr-1/apr_encode.h -rw-r--r-- root/root usr/include/apr-1/apr_env.h @@ -27,73 +19,39 @@ drwxr-xr-x root/root usr/include/apr-1/ -rw-r--r-- root/root usr/include/apr-1/apr_getopt.h -rw-r--r-- root/root usr/include/apr-1/apr_global_mutex.h -rw-r--r-- root/root usr/include/apr-1/apr_hash.h --rw-r--r-- root/root usr/include/apr-1/apr_hooks.h -rw-r--r-- root/root usr/include/apr-1/apr_inherit.h --rw-r--r-- root/root usr/include/apr-1/apr_ldap.h --rw-r--r-- root/root usr/include/apr-1/apr_ldap_init.h --rw-r--r-- root/root usr/include/apr-1/apr_ldap_option.h --rw-r--r-- root/root usr/include/apr-1/apr_ldap_rebind.h --rw-r--r-- root/root usr/include/apr-1/apr_ldap_url.h -rw-r--r-- root/root usr/include/apr-1/apr_lib.h --rw-r--r-- root/root usr/include/apr-1/apr_md4.h --rw-r--r-- root/root usr/include/apr-1/apr_md5.h --rw-r--r-- root/root usr/include/apr-1/apr_memcache.h -rw-r--r-- root/root usr/include/apr-1/apr_mmap.h -rw-r--r-- root/root usr/include/apr-1/apr_network_io.h --rw-r--r-- root/root usr/include/apr-1/apr_optional.h --rw-r--r-- root/root usr/include/apr-1/apr_optional_hooks.h -rw-r--r-- root/root usr/include/apr-1/apr_perms_set.h -rw-r--r-- root/root usr/include/apr-1/apr_poll.h -rw-r--r-- root/root usr/include/apr-1/apr_pools.h -rw-r--r-- root/root usr/include/apr-1/apr_portable.h -rw-r--r-- root/root usr/include/apr-1/apr_proc_mutex.h --rw-r--r-- root/root usr/include/apr-1/apr_queue.h -rw-r--r-- root/root usr/include/apr-1/apr_random.h --rw-r--r-- root/root usr/include/apr-1/apr_redis.h --rw-r--r-- root/root usr/include/apr-1/apr_reslist.h -rw-r--r-- root/root usr/include/apr-1/apr_ring.h --rw-r--r-- root/root usr/include/apr-1/apr_rmm.h --rw-r--r-- root/root usr/include/apr-1/apr_sdbm.h --rw-r--r-- root/root usr/include/apr-1/apr_sha1.h -rw-r--r-- root/root usr/include/apr-1/apr_shm.h -rw-r--r-- root/root usr/include/apr-1/apr_signal.h --rw-r--r-- root/root usr/include/apr-1/apr_siphash.h -rw-r--r-- root/root usr/include/apr-1/apr_skiplist.h -rw-r--r-- root/root usr/include/apr-1/apr_strings.h --rw-r--r-- root/root usr/include/apr-1/apr_strmatch.h -rw-r--r-- root/root usr/include/apr-1/apr_support.h -rw-r--r-- root/root usr/include/apr-1/apr_tables.h -rw-r--r-- root/root usr/include/apr-1/apr_thread_cond.h -rw-r--r-- root/root usr/include/apr-1/apr_thread_mutex.h --rw-r--r-- root/root usr/include/apr-1/apr_thread_pool.h -rw-r--r-- root/root usr/include/apr-1/apr_thread_proc.h -rw-r--r-- root/root usr/include/apr-1/apr_thread_rwlock.h -rw-r--r-- root/root usr/include/apr-1/apr_time.h --rw-r--r-- root/root usr/include/apr-1/apr_uri.h -rw-r--r-- root/root usr/include/apr-1/apr_user.h --rw-r--r-- root/root usr/include/apr-1/apr_uuid.h -rw-r--r-- root/root usr/include/apr-1/apr_version.h -rw-r--r-- root/root usr/include/apr-1/apr_want.h --rw-r--r-- root/root usr/include/apr-1/apr_xlate.h --rw-r--r-- root/root usr/include/apr-1/apr_xml.h --rw-r--r-- root/root usr/include/apr-1/apu.h --rw-r--r-- root/root usr/include/apr-1/apu_errno.h --rw-r--r-- root/root usr/include/apr-1/apu_version.h --rw-r--r-- root/root usr/include/apr-1/apu_want.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libapr-1.a -rwxr-xr-x root/root usr/lib/libapr-1.la -lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.7.0 -lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.7.0 --rwxr-xr-x root/root usr/lib/libapr-1.so.0.7.0 --rw-r--r-- root/root usr/lib/libaprutil-1.a --rwxr-xr-x root/root usr/lib/libaprutil-1.la -lrwxrwxrwx root/root usr/lib/libaprutil-1.so -> libaprutil-1.so.0.6.1 -lrwxrwxrwx root/root usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.6.1 --rwxr-xr-x root/root usr/lib/libaprutil-1.so.0.6.1 +lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.7.1 +lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.7.1 +-rwxr-xr-x root/root usr/lib/libapr-1.so.0.7.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/apr-1.pc --rw-r--r-- root/root usr/lib/pkgconfig/apr-util-1.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/apr-1/ -rw-r--r-- root/root usr/share/apr-1/apr_rules.mk diff --git a/apr/.signature b/apr/.signature index e8eb6b59f..c8668c20c 100644 --- a/apr/.signature +++ b/apr/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UeToMgjJFBQDeYGY1K3eb+bA03/BUYJR6yNNxy5jixeUXxu8OY2CRXQK19ARXHNcPOLs4+nWFriyuFU5ITOFg4= -SHA256 (Pkgfile) = bb635a71930c583ad51dfb8d70f337574f0d0df979975ebe10b0117d12c3233f -SHA256 (.footprint) = 7677ca29935b7a0838348fb7a1d04b78e542b998a93760ca2ee5b52c7735b5cf -SHA256 (apr-1.7.0.tar.bz2) = e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea -SHA256 (apr-util-1.6.1.tar.bz2) = d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b +RWSE3ohX2g5d/czOOTTg+diQrGczRbBQhQpJ07HkvO9XMh0lxLqQ9kOPBiHyASq7acPwh03YMbqWiIdQClkYtoM7IfFJsRY9RQU= +SHA256 (Pkgfile) = b30c97955d202b56db58cab60f3bf9a785fa9c0772575317843e34b6ef483366 +SHA256 (.footprint) = 09dbaeb20df3e5041a4d2e316ca2762ace63467bbe808f1818be94c21bbd5693 +SHA256 (apr-1.7.1.tar.bz2) = 402f8fcd12fbedbf12e681900d341c1f78d71b033104b201680933dc839c8d26 diff --git a/apr/Pkgfile b/apr/Pkgfile index bfc13decd..6afac488a 100644 --- a/apr/Pkgfile +++ b/apr/Pkgfile @@ -1,33 +1,22 @@ # Description: Apache Portable Runtime library -# Maintainer: Juergen Daubert, jue at crux dot nu -# URL: http://apr.apache.org/ -# Depends on: util-linux, expat, db, gdbm +# Maintainer: Juergen Daubert, jue at crux dot nu +# URL: https://apr.apache.org/ +# Depends on: util-linux name=apr -version=1.7.0 +version=1.7.1 release=1 -source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \ - http://www.apache.org/dist/$name/$name-util-1.6.1.tar.bz2) +source=(https://downloads.apache.org/$name/$name-$version.tar.bz2) build(){ - cd $name-$version - ./configure --prefix=/usr \ - --with-installbuilddir=/usr/share/apr-1 - make - make -j1 DESTDIR=$PKG install + cd $name-$version-rc2 - cd $SRC/$name-util-1.6.1 - ./configure --prefix=/usr \ - --with-apr=$SRC/$name-$version \ - --with-expat=/usr \ - --with-berkeley-db=/usr \ - --with-gdbm=/usr \ - --without-sqlite3 \ - --disable-util-dso - make - make DESTDIR=$PKG install + ./configure \ + --prefix=/usr \ + --with-installbuilddir=/usr/share/apr-1 + make + make DESTDIR=$PKG install - sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-1-config - sed -i -r "/^APU_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apu-1-config - rm -r $PKG/usr/lib/*.exp + sed -i -r "/^APR_(SOURCE|BUILD)/s|=.*|=|" $PKG/usr/bin/apr-1-config + rm -r $PKG/usr/lib/*.exp }