August 2019 - crux-commits

ports/opt (3.5): glib-networking: ->
by crux＠crux.nu 03 Aug '19

03 Aug '19

commit 54b279772369ecc54f9a3afd6ab104f74715970f Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 3 23:23:28 2019 +1000 glib-networking: -> diff --git a/glib-networking/.signature b/glib-networking/.signature index dc368fa2c..4a2a9d4ee 100644 --- a/glib-networking/.signature +++ b/glib-networking/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/awEYtudmT/eE+Lp3wFfU2EJT4kxQIQFNpsCoEt8dKwNBzUQVmN4zmnPJdSL6TCHo2j+1BnjqrGZOhsSyJJHyAE= -SHA256 (Pkgfile) = 33b3de19c47a5881b4e8b53399feb7ff916f16c787c4780019b632b8a9252754 +RWSE3ohX2g5d/bxmv20w1AAi9Z6/MvTuNO5r9s0Zzv/eZd90fydg6OhdFHhxwWdNzi4CiDNERO2IG4hAVqHbdZYysUx8PsvZ6ww= +SHA256 (Pkgfile) = 26f45c3f8b910d7b298184e6c1ffa2f63f1fe9661aa790cf7ca5ba1d1f7a8c50 SHA256 (.footprint) = 30ea4d576e1f2045ce73b27bbc8ddfc7d1d0ee7951dc97f4bb2a3c5c8d933d05 SHA256 (glib-networking-2.60.3.tar.xz) = d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5 diff --git a/glib-networking/Pkgfile b/glib-networking/Pkgfile index 8705c99f8..e36c8ffec 100644 --- a/glib-networking/Pkgfile +++ b/glib-networking/Pkgfile @@ -5,7 +5,7 @@ name=glib-networking version=2.60.3 -release=1 +release=2 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$vers… build() { @@ -13,8 +13,7 @@ build() { meson build \ --prefix /usr \ - -Dlibproxy_support=false \ - -Dca_certificates_path=/etc/ssl/cert.pem + -Dlibproxy=disabled ninja -C build -j ${JOBS:-1} DESTDIR="$PKG" ninja -C build install

1 0

ports/core (3.5): man-pages: update to 5.02
by crux＠crux.nu 03 Aug '19

03 Aug '19

commit 69665585186eca3d879fdced107ecdbe852b0531 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 3 12:29:25 2019 +0200 man-pages: update to 5.02 diff --git a/man-pages/.footprint b/man-pages/.footprint index 3abe6c54..69822ac2 100644 --- a/man-pages/.footprint +++ b/man-pages/.footprint @@ -3332,7 +3332,6 @@ drwxr-xr-x root/root usr/share/man/man5/ -rw-r--r-- root/root usr/share/man/man5/hosts.5.gz -rw-r--r-- root/root usr/share/man/man5/hosts.equiv.5.gz -rw-r--r-- root/root usr/share/man/man5/intro.5.gz --rw-r--r-- root/root usr/share/man/man5/ipc.5.gz -rw-r--r-- root/root usr/share/man/man5/issue.5.gz -rw-r--r-- root/root usr/share/man/man5/locale.5.gz -rw-r--r-- root/root usr/share/man/man5/motd.5.gz @@ -3502,6 +3501,7 @@ drwxr-xr-x root/root usr/share/man/man7/ -rw-r--r-- root/root usr/share/man/man7/suffixes.7.gz -rw-r--r-- root/root usr/share/man/man7/svipc.7.gz -rw-r--r-- root/root usr/share/man/man7/symlink.7.gz +-rw-r--r-- root/root usr/share/man/man7/sysvipc.7.gz -rw-r--r-- root/root usr/share/man/man7/tcp.7.gz -rw-r--r-- root/root usr/share/man/man7/termio.7.gz -rw-r--r-- root/root usr/share/man/man7/thread-keyring.7.gz diff --git a/man-pages/.signature b/man-pages/.signature index 89a149e4..530018ae 100644 --- a/man-pages/.signature +++ b/man-pages/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqmXLPhb4mpaKEdjJkdkucWBPomH8Jlf9PybF5sXN331ZWCb5EMsI35GFJ6IqqvPCK5a66/q20JFCYEaKg6jc2A4= -SHA256 (Pkgfile) = 308186df1aea71630acf8915c0d60ca7b102a65e29f1710ef11c1a819232d6ec -SHA256 (.footprint) = 16e3d77104244621aa0ca257279240c22a9fc37c55a86178cf0b0a8cba4c36ae -SHA256 (man-pages-5.01.tar.xz) = 7dfce1334e22e2565cf219a83c5cdfa1fc5e877d54ee15a0d1f5f1de5143b627 +RWRJc1FUaeVeqoqpd663JzjVoryc//tCZVxCdaSmoy5CzQtz5FkPCB/DS64eim1YB3C/FsdA1rWFHjOLXBISTEvXb4QA5htnmg0= +SHA256 (Pkgfile) = 90f4a9db0d8333b791491ef3da392a9f0862c566bb7b5f6b9927932eb66ce2e9 +SHA256 (.footprint) = 3245aa929c1567977e9f4ee60836898750ebda6d341757b6f84ee519449b4d6f +SHA256 (man-pages-5.02.tar.xz) = c2faa85e625cd7567dc1dec9f23d1af1f73e2ca6468bce1bdc13387ec56f97e8 SHA256 (man-pages-posix-2013-a.tar.xz) = 19633a5c75ff7deab35b1d2c3d5b7748e7bd4ef4ab598b647bb7e7f60b90a808 diff --git a/man-pages/Pkgfile b/man-pages/Pkgfile index 521eac2c..1ef7cb99 100644 --- a/man-pages/Pkgfile +++ b/man-pages/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=man-pages -version=5.01 +version=5.02 release=1 source=(http://www.kernel.org/pub/linux/docs/$name/$name-$version.tar.xz \ http://www.kernel.org/pub/linux/docs/$name/$name-posix/$name-posix-2013-a.t…)

1 0

ports/core (3.5): kbd: update to 2.2.0
by crux＠crux.nu 03 Aug '19

03 Aug '19

commit b8cb2976f870803f9dd30f2e6d9f492b1b6a1425 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Aug 3 12:29:06 2019 +0200 kbd: update to 2.2.0 diff --git a/kbd/.signature b/kbd/.signature index 407b3e8b..06cd0aa7 100644 --- a/kbd/.signature +++ b/kbd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqvBmelSaoTm4k8ShMBH8DUWQe8s3hxIY7vnudr2FR/e+gLWEUPkwSNzUKRg6JQRZ18ZLyCMeARgjJ/NSi+7/rQk= -SHA256 (Pkgfile) = 49e87b1f590efd6445d08eba4634e8aac7074a80e0403e6a52af7ce901606157 +RWRJc1FUaeVeqm8YusBq909dlgniVQmldWa3YGV/DYVfva+Ms6GFr3oUh6NmrM0dgq1W6wbmioUPnuHL3e6mitMhAw7plmoIAgA= +SHA256 (Pkgfile) = a818e97c78f2f81b8059cea2b0b4de8d704affd9ecdb19b7e6f2f7dcdd41ace9 SHA256 (.footprint) = e09e539b0e4723c6c9b0a4378065beb476ed413d78c1c769ec311dfb934da5ec -SHA256 (kbd-2.1.0.tar.xz) = 6740e896b9fe62b7234ff64e4b41cf5f3e1c3a4032cbd963eefebe04f2457cc1 +SHA256 (kbd-2.2.0.tar.xz) = 21a1bc5f6fb3b18ce9fdd717e4533368060a3182a39c7155eaf7ec0f5f83e9f7 diff --git a/kbd/Pkgfile b/kbd/Pkgfile index 1f5bd93d..9bccea31 100644 --- a/kbd/Pkgfile +++ b/kbd/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=kbd -version=2.1.0 +version=2.2.0 release=1 source=(https://www.kernel.org/pub/linux/utils/$name/$name-$version.tar.xz)

1 0

ports/contrib (3.5): qownnotes: 19.8.0 -> 19.8.1
by crux＠crux.nu 03 Aug '19

03 Aug '19

commit 28dd8370b958ff5fa8c41affc96f00b497bbb9a2 Author: Tim Biermann <tbier(a)posteo.de> Date: Sat Aug 3 11:19:20 2019 +0200 qownnotes: 19.8.0 -> 19.8.1 diff --git a/qownnotes/.signature b/qownnotes/.signature index 3356d198..61cbaf34 100644 --- a/qownnotes/.signature +++ b/qownnotes/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3zuRZRhyI06RoIaOkGi16znVAGcxgxcU1Fh/8jOFFd5WB4s87b1V1zUBCYYXaqvV1Un5ELlY47DCwxOg6V3lMws= -SHA256 (Pkgfile) = 9975847233ac01675985a0f2f62f673d3156572ce0278365f6b66ebb2b0442bf +RWSagIOpLGJF385b6blD4nwAei6cM3r1gLrVLuvDekGbHgeTjPUmmwIOXBwvB+lMAFmgvjPS4q/X/OS17z4cFjXVyYPaZtKBowU= +SHA256 (Pkgfile) = 5986c047780de5ec13e070248123ce5e61a6ca5af3721144d359b5625ff17856 SHA256 (.footprint) = d3916e94908249d530356c1e79cef586cdeacf7bd488278a3f0c61ab5be2aab3 -SHA256 (qownnotes-19.8.0.tar.xz) = c3623ab29279b2e35026737926f4a5f04af0368290c51420b1d180eb6955950c +SHA256 (qownnotes-19.8.1.tar.xz) = 3518bea5a362474b6d71c508996a30a9239aeb5ddcbdd6c7d7825405c04ba7a7 diff --git a/qownnotes/Pkgfile b/qownnotes/Pkgfile index 40253906..5cb8f7ee 100644 --- a/qownnotes/Pkgfile +++ b/qownnotes/Pkgfile @@ -4,7 +4,7 @@ # Depends on: gcc glibc graphite2 icu qt5 name=qownnotes -version=19.8.0 +version=19.8.1 release=1 source=(https://download.tuxfamily.org/$name/src/$name-$version.tar.xz)

1 0

ports/opt (3.5): glib-networking: 2.56.1 -> 2.60.3
by crux＠crux.nu 03 Aug '19

03 Aug '19

commit 54305aec061901e82ac093ea66757463b51d58e0 Author: Danny Rawlins <monster.romster(a)gmail.com> Date: Sat Aug 3 17:57:02 2019 +1000 glib-networking: 2.56.1 -> 2.60.3 diff --git a/glib-networking/.signature b/glib-networking/.signature index 8c064edbe..dc368fa2c 100644 --- a/glib-networking/.signature +++ b/glib-networking/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SRaLppditR1/VRfT4753B5tf+MVEIk88lE1utsNnBWcfTL8YuV5Bp40Dg8T2yjAivT39EL5Hf4hon6z64E6yAM= -SHA256 (Pkgfile) = 00e37a4e31c7847cefa40d8094fdde054f914a70f3279660921311ace84cf632 +RWSE3ohX2g5d/awEYtudmT/eE+Lp3wFfU2EJT4kxQIQFNpsCoEt8dKwNBzUQVmN4zmnPJdSL6TCHo2j+1BnjqrGZOhsSyJJHyAE= +SHA256 (Pkgfile) = 33b3de19c47a5881b4e8b53399feb7ff916f16c787c4780019b632b8a9252754 SHA256 (.footprint) = 30ea4d576e1f2045ce73b27bbc8ddfc7d1d0ee7951dc97f4bb2a3c5c8d933d05 -SHA256 (glib-networking-2.56.1.tar.xz) = df47b0e0a037d2dcf6b1846cbdf68dd4b3cc055e026bb40c4a55f19f29f635c8 +SHA256 (glib-networking-2.60.3.tar.xz) = d50183046a4ff955d8cc7e953067cdfc94f14dbfda3024bf377ff37a3121dcd5 diff --git a/glib-networking/Pkgfile b/glib-networking/Pkgfile index 5a5bf712f..8705c99f8 100644 --- a/glib-networking/Pkgfile +++ b/glib-networking/Pkgfile @@ -1,10 +1,10 @@ # Description: Network-related giomodules for glib. # URL: http://git.gnome.org/browse/glib-networking/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: gnutls gsettings-desktop-schemas meson ninja +# Depends on: gnutls gsettings-desktop-schemas name=glib-networking -version=2.56.1 +version=2.60.3 release=1 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$vers…

1 0

ports/opt (3.5): [notify] libevent: update to 2.1.11
by crux＠crux.nu 02 Aug '19

02 Aug '19

commit 724b23198082ba3146288b0e43aee1c6046cffa1 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 2 15:45:04 2019 +0200 [notify] libevent: update to 2.1.11 ABI has been changed, rebuild of direct dependent ports like tmux or nfs-utils required. Run revdep after update. diff --git a/libevent/.footprint b/libevent/.footprint index 2dee616d8..042f756f5 100644 --- a/libevent/.footprint +++ b/libevent/.footprint @@ -35,31 +35,31 @@ drwxr-xr-x root/root usr/include/event2/ -rw-r--r-- root/root usr/include/evrpc.h -rw-r--r-- root/root usr/include/evutil.h drwxr-xr-x root/root usr/lib/ -lrwxrwxrwx root/root usr/lib/libevent-2.1.so.6 -> libevent-2.1.so.6.0.4 --rwxr-xr-x root/root usr/lib/libevent-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent-2.1.so.7 -> libevent-2.1.so.7.0.0 +-rwxr-xr-x root/root usr/lib/libevent-2.1.so.7.0.0 -rw-r--r-- root/root usr/lib/libevent.a -rwxr-xr-x root/root usr/lib/libevent.la -lrwxrwxrwx root/root usr/lib/libevent.so -> libevent-2.1.so.6.0.4 -lrwxrwxrwx root/root usr/lib/libevent_core-2.1.so.6 -> libevent_core-2.1.so.6.0.4 --rwxr-xr-x root/root usr/lib/libevent_core-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent.so -> libevent-2.1.so.7.0.0 +lrwxrwxrwx root/root usr/lib/libevent_core-2.1.so.7 -> libevent_core-2.1.so.7.0.0 +-rwxr-xr-x root/root usr/lib/libevent_core-2.1.so.7.0.0 -rw-r--r-- root/root usr/lib/libevent_core.a -rwxr-xr-x root/root usr/lib/libevent_core.la -lrwxrwxrwx root/root usr/lib/libevent_core.so -> libevent_core-2.1.so.6.0.4 -lrwxrwxrwx root/root usr/lib/libevent_extra-2.1.so.6 -> libevent_extra-2.1.so.6.0.4 --rwxr-xr-x root/root usr/lib/libevent_extra-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent_core.so -> libevent_core-2.1.so.7.0.0 +lrwxrwxrwx root/root usr/lib/libevent_extra-2.1.so.7 -> libevent_extra-2.1.so.7.0.0 +-rwxr-xr-x root/root usr/lib/libevent_extra-2.1.so.7.0.0 -rw-r--r-- root/root usr/lib/libevent_extra.a -rwxr-xr-x root/root usr/lib/libevent_extra.la -lrwxrwxrwx root/root usr/lib/libevent_extra.so -> libevent_extra-2.1.so.6.0.4 -lrwxrwxrwx root/root usr/lib/libevent_openssl-2.1.so.6 -> libevent_openssl-2.1.so.6.0.4 --rwxr-xr-x root/root usr/lib/libevent_openssl-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent_extra.so -> libevent_extra-2.1.so.7.0.0 +lrwxrwxrwx root/root usr/lib/libevent_openssl-2.1.so.7 -> libevent_openssl-2.1.so.7.0.0 +-rwxr-xr-x root/root usr/lib/libevent_openssl-2.1.so.7.0.0 -rw-r--r-- root/root usr/lib/libevent_openssl.a -rwxr-xr-x root/root usr/lib/libevent_openssl.la -lrwxrwxrwx root/root usr/lib/libevent_openssl.so -> libevent_openssl-2.1.so.6.0.4 -lrwxrwxrwx root/root usr/lib/libevent_pthreads-2.1.so.6 -> libevent_pthreads-2.1.so.6.0.4 --rwxr-xr-x root/root usr/lib/libevent_pthreads-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent_openssl.so -> libevent_openssl-2.1.so.7.0.0 +lrwxrwxrwx root/root usr/lib/libevent_pthreads-2.1.so.7 -> libevent_pthreads-2.1.so.7.0.0 +-rwxr-xr-x root/root usr/lib/libevent_pthreads-2.1.so.7.0.0 -rw-r--r-- root/root usr/lib/libevent_pthreads.a -rwxr-xr-x root/root usr/lib/libevent_pthreads.la -lrwxrwxrwx root/root usr/lib/libevent_pthreads.so -> libevent_pthreads-2.1.so.6.0.4 +lrwxrwxrwx root/root usr/lib/libevent_pthreads.so -> libevent_pthreads-2.1.so.7.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libevent.pc -rw-r--r-- root/root usr/lib/pkgconfig/libevent_core.pc diff --git a/libevent/.signature b/libevent/.signature index 0d54a59dd..98f8b0883 100644 --- a/libevent/.signature +++ b/libevent/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dUABHUkInqtrQ4rOLnGH8v1/Q9OAxre4JCURqEy41I5sSmOac0LX2ko6xyamtRy+GbffEkGmQpP8QyQdiExkAA= -SHA256 (Pkgfile) = 791c278d6215b417d2c63f10086f3e93f103d9e14ee0b61f1c2260b12192c4cb -SHA256 (.footprint) = 093ffab0a7913425754fb87a51b44e9ffbd0fce8acb18344c1363f99213ff191 -SHA256 (libevent-2.1.10-stable.tar.gz) = e864af41a336bb11dab1a23f32993afe963c1f69618bd9292b89ecf6904845b0 +RWSE3ohX2g5d/fBdVwxB4fwK25yHkNVXcItl/mzJXCHcJSCg0ewVj0Rt+G7s2/aWmUHQ+iigthCpMEnD5RMQ1ycVuxEdOdw9Xgw= +SHA256 (Pkgfile) = 9c3782df5fadb2c79f3e5f048421e77a61dd7cbc9b215aaacfde2e52fe26371f +SHA256 (.footprint) = 737d7bae7a37238124f43945d6feab1daca1888d1b735e20d981784916782a6a +SHA256 (libevent-2.1.11-stable.tar.gz) = a65bac6202ea8c5609fd5c7e480e6d25de467ea1917c08290c521752f147283d diff --git a/libevent/Pkgfile b/libevent/Pkgfile index 1f3aceda8..a8cdb4f9d 100644 --- a/libevent/Pkgfile +++ b/libevent/Pkgfile @@ -4,7 +4,7 @@ # Depends on: openssl name=libevent -version=2.1.10 +version=2.1.11 release=1 source=(https://github.com/libevent/libevent/releases/download/release-$ver…

1 0

ports/contrib (3.5): subversion-python: update to 1.9.12
by crux＠crux.nu 01 Aug '19

01 Aug '19

commit f19186ffe250bac8477ab053782df7a750d51098 Author: John Vogel <jvogel4(a)stny.rr.com> Date: Thu Aug 1 17:11:42 2019 -0400 subversion-python: update to 1.9.12 diff --git a/subversion-python/.signature b/subversion-python/.signature index e710731a..aecc6761 100644 --- a/subversion-python/.signature +++ b/subversion-python/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z3+OZthyJB/Iw4Pg/bF5qXj8vhcoI0LeZaiBmoVk3u97tqYQHKziniSHjjWtMMLYCdInO4ZVq+/UJTMrOJ7Zws= -SHA256 (Pkgfile) = 39ce3f7d4116f2f5305ccefc4d4e7fb26f8d507aa3a8b5cf8caeb04cece43a00 +RWSagIOpLGJF3zusjALD5XPNwRft1/6aDhSseGV1tdROqAwEqZt0UDQGOR+B8gf9zuigeCiFAgd/MZa15vK8g4UmCPn3bu+lSgk= +SHA256 (Pkgfile) = ffef1c6344dcf7fe6845cb11ebbc33891c3b1f76d6926f281439e5585c86aa92 SHA256 (.footprint) = 048ad54e9c933eb087ee5f43127ca4fdf1337c493320c02fc344e513b73f96c3 -SHA256 (subversion-1.9.10.tar.bz2) = ae28c656535c8b817f469e6ee6951e9840ea2d64c7ff0e98c728638bb45c9cd7 -SHA256 (apr-1.7.patch) = f7b6ccd807a15e899a592a53b256f70a7651e2078453d12e0242658a180a8d64 +SHA256 (subversion-1.9.12.tar.bz2) = 3c3a15fd73a21ab55556d7c291cf40e25ade1c070294504aa50b4767db1be397 diff --git a/subversion-python/Pkgfile b/subversion-python/Pkgfile index 7e4fe872..4edcf00b 100644 --- a/subversion-python/Pkgfile +++ b/subversion-python/Pkgfile @@ -4,19 +4,15 @@ # Depends on: subversion swig name=subversion-python -version=1.9.10 +version=1.9.12 release=1 -source=(https://www.apache.org/dist/subversion/subversion-$version.tar.bz2 - apr-1.7.patch) +source=(https://www.apache.org/dist/subversion/subversion-$version.tar.bz2) build() { PYTHONVERSION=$(python -c "import sys; print \"%s.%s\" % (sys.version_info[0], sys.version_info[1]);") cd subversion-$version - patch -p1 -i $SRC/apr-1.7.patch - - ./autogen.sh ./configure \ --prefix=/usr \ --disable-nls \ diff --git a/subversion-python/apr-1.7.patch b/subversion-python/apr-1.7.patch deleted file mode 100644 index 7f1bdd49..00000000 --- a/subversion-python/apr-1.7.patch +++ /dev/null @@ -1,101 +0,0 @@ -From d67979e61f8659af05fd4d0384a2db33645df83d Mon Sep 17 00:00:00 2001 -From: Stefan Sperling <stsp(a)apache.org> -Date: Fri, 12 Apr 2019 09:27:33 +0000 -Subject: [PATCH] Get rid of apr_int64_t format string check in swig py - configure. - -This check relied on APR implementation details and broke with APR 1.7.0. -Rather than trying to guess a perfect format string to use, just use the -largest possible format and cast the argument accordingly. - -Should fix build against APR 1.7.0 and later. - -Suggested by: brane - -* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. - -* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c - (svn_swig_py_client_blame_receiver_func): Stop relying on the - SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and - acast to PY_LONG_LONG instead. - - -git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1857391 13f79535-47bb-0310-9956-ffa450edef68 ---- - build/ac-macros/swig.m4 | 35 ------------------- - .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++-- - 2 files changed, 4 insertions(+), 40 deletions(-) - -diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 55501fb882f..29638727363 100644 ---- a/build/ac-macros/swig.m4 -+++ b/build/ac-macros/swig.m4 -@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG, - ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`" - ]) - SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`" -- -- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT -- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT -- dnl thus the egrep patterns have a + in them. -- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" -- AC_CACHE_CHECK([for apr_int64_t Python/C API format string], -- [svn_cv_pycfmt_apr_int64_t], [ -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="L"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="l"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="i"]) -- fi -- ]) -- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform]) -- fi -- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT], -- ["$svn_cv_pycfmt_apr_int64_t"], -- [Define to the Python/C API format character suitable] -- [ for apr_int64_t]) - fi - - if test "$PERL" != "none"; then -diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -index 2c90a6a464d..abe5a2ab64c 100644 ---- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -@@ -46,7 +46,7 @@ - #include "svn_mergeinfo.h" - #include "svn_types.h" - --#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */ -+#include "svn_private_config.h" - - #include "swig_python_external_runtime.swg" - #include "swigutil_py.h" -@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton, - svn_swig_py_acquire_py_lock(); - - if ((result = PyObject_CallFunction(receiver, -- (char *) -- (SVN_APR_INT64_T_PYCFMT "lsssO&"), -- line_no, revision, author, date, line, -- make_ob_pool, pool)) == NULL) -+ (char *)"LlsssO&", -+ (PY_LONG_LONG)line_no, revision, author, -+ date, line, make_ob_pool, pool)) == NULL) - { - err = callback_exception_error(); - }

1 0

ports/contrib (3.5): subversion-perl: update to 1.9.12
by crux＠crux.nu 01 Aug '19

01 Aug '19

commit 969d4bab05fd99fb3edc2be220d4dc7574b6411f Author: John Vogel <jvogel4(a)stny.rr.com> Date: Thu Aug 1 16:58:36 2019 -0400 subversion-perl: update to 1.9.12 diff --git a/subversion-perl/.signature b/subversion-perl/.signature index 0cc5433e..10d2eb19 100644 --- a/subversion-perl/.signature +++ b/subversion-perl/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF32usRew/pxrjUO5STbTRsh+dgtzubn/fThDY5a+X994S7/a/tq8+MCkAtBcCW/Gyi/dEuc0j3s/4kXnXMOWIXQI= -SHA256 (Pkgfile) = 5a26460a6a555e8fe9e357059dfb5ed6eed3a10e549a664e2e44d77fcbac1fce +RWSagIOpLGJF3wj8ibXIkJKJLFQHuPZa0JsbuyToGEB71JiqhFl32ZuCZCcfEe7YIONasqMiQh89waP2GjEo58iR3PjH2+4uZAU= +SHA256 (Pkgfile) = 17f8ae2f0a7af467fcf1bd5c9d649c85ded9691589898cb07dda2757a086f36d SHA256 (.footprint) = a4676e8951608a423860f7542c2716f663093e2c197930dbec90d1b50ee994f5 -SHA256 (subversion-1.9.10.tar.bz2) = ae28c656535c8b817f469e6ee6951e9840ea2d64c7ff0e98c728638bb45c9cd7 -SHA256 (apr-1.7.patch) = f7b6ccd807a15e899a592a53b256f70a7651e2078453d12e0242658a180a8d64 +SHA256 (subversion-1.9.12.tar.bz2) = 3c3a15fd73a21ab55556d7c291cf40e25ade1c070294504aa50b4767db1be397 diff --git a/subversion-perl/Pkgfile b/subversion-perl/Pkgfile index 1d9b420c..c63de99c 100644 --- a/subversion-perl/Pkgfile +++ b/subversion-perl/Pkgfile @@ -4,17 +4,13 @@ # Depends on: subversion swig name=subversion-perl -version=1.9.10 +version=1.9.12 release=1 -source=(https://www.apache.org/dist/subversion/subversion-$version.tar.bz2 - apr-1.7.patch) +source=(https://www.apache.org/dist/subversion/subversion-$version.tar.bz2) build() { cd subversion-$version - patch -p1 -i $SRC/apr-1.7.patch - - ./autogen.sh ./configure \ --prefix=/usr \ --disable-nls \ diff --git a/subversion-perl/apr-1.7.patch b/subversion-perl/apr-1.7.patch deleted file mode 100644 index 7f1bdd49..00000000 --- a/subversion-perl/apr-1.7.patch +++ /dev/null @@ -1,101 +0,0 @@ -From d67979e61f8659af05fd4d0384a2db33645df83d Mon Sep 17 00:00:00 2001 -From: Stefan Sperling <stsp(a)apache.org> -Date: Fri, 12 Apr 2019 09:27:33 +0000 -Subject: [PATCH] Get rid of apr_int64_t format string check in swig py - configure. - -This check relied on APR implementation details and broke with APR 1.7.0. -Rather than trying to guess a perfect format string to use, just use the -largest possible format and cast the argument accordingly. - -Should fix build against APR 1.7.0 and later. - -Suggested by: brane - -* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. - -* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c - (svn_swig_py_client_blame_receiver_func): Stop relying on the - SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and - acast to PY_LONG_LONG instead. - - -git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1857391 13f79535-47bb-0310-9956-ffa450edef68 ---- - build/ac-macros/swig.m4 | 35 ------------------- - .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++-- - 2 files changed, 4 insertions(+), 40 deletions(-) - -diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 55501fb882f..29638727363 100644 ---- a/build/ac-macros/swig.m4 -+++ b/build/ac-macros/swig.m4 -@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG, - ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`" - ]) - SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`" -- -- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT -- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT -- dnl thus the egrep patterns have a + in them. -- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" -- AC_CACHE_CHECK([for apr_int64_t Python/C API format string], -- [svn_cv_pycfmt_apr_int64_t], [ -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="L"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="l"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="i"]) -- fi -- ]) -- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform]) -- fi -- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT], -- ["$svn_cv_pycfmt_apr_int64_t"], -- [Define to the Python/C API format character suitable] -- [ for apr_int64_t]) - fi - - if test "$PERL" != "none"; then -diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -index 2c90a6a464d..abe5a2ab64c 100644 ---- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -@@ -46,7 +46,7 @@ - #include "svn_mergeinfo.h" - #include "svn_types.h" - --#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */ -+#include "svn_private_config.h" - - #include "swig_python_external_runtime.swg" - #include "swigutil_py.h" -@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton, - svn_swig_py_acquire_py_lock(); - - if ((result = PyObject_CallFunction(receiver, -- (char *) -- (SVN_APR_INT64_T_PYCFMT "lsssO&"), -- line_no, revision, author, date, line, -- make_ob_pool, pool)) == NULL) -+ (char *)"LlsssO&", -+ (PY_LONG_LONG)line_no, revision, author, -+ date, line, make_ob_pool, pool)) == NULL) - { - err = callback_exception_error(); - }

1 0

ports/contrib (3.5): subversion: import from opt, update to 1.9.12
by crux＠crux.nu 01 Aug '19

01 Aug '19

commit ac2b5461716081058f171a89125bb71236255be7 Author: John Vogel <jvogel4(a)stny.rr.com> Date: Thu Aug 1 16:36:21 2019 -0400 subversion: import from opt, update to 1.9.12 Drop apr patch (fixed upstream) diff --git a/subversion/.footprint b/subversion/.footprint new file mode 100644 index 00000000..29b9ccc3 --- /dev/null +++ b/subversion/.footprint @@ -0,0 +1,167 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/svn +-rwxr-xr-x root/root usr/bin/svnadmin +-rwxr-xr-x root/root usr/bin/svnbench +-rwxr-xr-x root/root usr/bin/svndumpfilter +-rwxr-xr-x root/root usr/bin/svnfsfs +-rwxr-xr-x root/root usr/bin/svnlook +-rwxr-xr-x root/root usr/bin/svnmucc +-rwxr-xr-x root/root usr/bin/svnrdump +-rwxr-xr-x root/root usr/bin/svnserve +-rwxr-xr-x root/root usr/bin/svnsync +-rwxr-xr-x root/root usr/bin/svnversion +drwxr-xr-x root/root usr/include/ +drwxr-xr-x root/root usr/include/subversion-1/ +-rw-r--r-- root/root usr/include/subversion-1/mod_authz_svn.h +-rw-r--r-- root/root usr/include/subversion-1/mod_dav_svn.h +-rw-r--r-- root/root usr/include/subversion-1/svn-revision.txt +-rw-r--r-- root/root usr/include/subversion-1/svn_auth.h +-rw-r--r-- root/root usr/include/subversion-1/svn_base64.h +-rw-r--r-- root/root usr/include/subversion-1/svn_cache_config.h +-rw-r--r-- root/root usr/include/subversion-1/svn_checksum.h +-rw-r--r-- root/root usr/include/subversion-1/svn_client.h +-rw-r--r-- root/root usr/include/subversion-1/svn_cmdline.h +-rw-r--r-- root/root usr/include/subversion-1/svn_compat.h +-rw-r--r-- root/root usr/include/subversion-1/svn_config.h +-rw-r--r-- root/root usr/include/subversion-1/svn_ctype.h +-rw-r--r-- root/root usr/include/subversion-1/svn_dav.h +-rw-r--r-- root/root usr/include/subversion-1/svn_delta.h +-rw-r--r-- root/root usr/include/subversion-1/svn_diff.h +-rw-r--r-- root/root usr/include/subversion-1/svn_dirent_uri.h +-rw-r--r-- root/root usr/include/subversion-1/svn_dso.h +-rw-r--r-- root/root usr/include/subversion-1/svn_error.h +-rw-r--r-- root/root usr/include/subversion-1/svn_error_codes.h +-rw-r--r-- root/root usr/include/subversion-1/svn_fs.h +-rw-r--r-- root/root usr/include/subversion-1/svn_hash.h +-rw-r--r-- root/root usr/include/subversion-1/svn_io.h +-rw-r--r-- root/root usr/include/subversion-1/svn_iter.h +-rw-r--r-- root/root usr/include/subversion-1/svn_md5.h +-rw-r--r-- root/root usr/include/subversion-1/svn_mergeinfo.h +-rw-r--r-- root/root usr/include/subversion-1/svn_nls.h +-rw-r--r-- root/root usr/include/subversion-1/svn_opt.h +-rw-r--r-- root/root usr/include/subversion-1/svn_path.h +-rw-r--r-- root/root usr/include/subversion-1/svn_pools.h +-rw-r--r-- root/root usr/include/subversion-1/svn_props.h +-rw-r--r-- root/root usr/include/subversion-1/svn_quoprint.h +-rw-r--r-- root/root usr/include/subversion-1/svn_ra.h +-rw-r--r-- root/root usr/include/subversion-1/svn_ra_svn.h +-rw-r--r-- root/root usr/include/subversion-1/svn_repos.h +-rw-r--r-- root/root usr/include/subversion-1/svn_sorts.h +-rw-r--r-- root/root usr/include/subversion-1/svn_string.h +-rw-r--r-- root/root usr/include/subversion-1/svn_subst.h +-rw-r--r-- root/root usr/include/subversion-1/svn_time.h +-rw-r--r-- root/root usr/include/subversion-1/svn_types.h +-rw-r--r-- root/root usr/include/subversion-1/svn_user.h +-rw-r--r-- root/root usr/include/subversion-1/svn_utf.h +-rw-r--r-- root/root usr/include/subversion-1/svn_version.h +-rw-r--r-- root/root usr/include/subversion-1/svn_wc.h +-rw-r--r-- root/root usr/include/subversion-1/svn_x509.h +-rw-r--r-- root/root usr/include/subversion-1/svn_xml.h +drwxr-xr-x root/root usr/lib/ +-rw-r--r-- root/root usr/lib/libsvn_client-1.a +-rwxr-xr-x root/root usr/lib/libsvn_client-1.la +lrwxrwxrwx root/root usr/lib/libsvn_client-1.so -> libsvn_client-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_client-1.so.0 -> libsvn_client-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_client-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_delta-1.a +-rwxr-xr-x root/root usr/lib/libsvn_delta-1.la +lrwxrwxrwx root/root usr/lib/libsvn_delta-1.so -> libsvn_delta-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_delta-1.so.0 -> libsvn_delta-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_delta-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_diff-1.a +-rwxr-xr-x root/root usr/lib/libsvn_diff-1.la +lrwxrwxrwx root/root usr/lib/libsvn_diff-1.so -> libsvn_diff-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_diff-1.so.0 -> libsvn_diff-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_diff-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_fs-1.a +-rwxr-xr-x root/root usr/lib/libsvn_fs-1.la +lrwxrwxrwx root/root usr/lib/libsvn_fs-1.so -> libsvn_fs-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_fs-1.so.0 -> libsvn_fs-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_fs-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_fs_base-1.a +-rwxr-xr-x root/root usr/lib/libsvn_fs_base-1.la +lrwxrwxrwx root/root usr/lib/libsvn_fs_base-1.so -> libsvn_fs_base-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_fs_base-1.so.0 -> libsvn_fs_base-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_fs_base-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_fs_fs-1.a +-rwxr-xr-x root/root usr/lib/libsvn_fs_fs-1.la +lrwxrwxrwx root/root usr/lib/libsvn_fs_fs-1.so -> libsvn_fs_fs-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_fs_fs-1.so.0 -> libsvn_fs_fs-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_fs_fs-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_fs_util-1.a +-rwxr-xr-x root/root usr/lib/libsvn_fs_util-1.la +lrwxrwxrwx root/root usr/lib/libsvn_fs_util-1.so -> libsvn_fs_util-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_fs_util-1.so.0 -> libsvn_fs_util-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_fs_util-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_fs_x-1.a +-rwxr-xr-x root/root usr/lib/libsvn_fs_x-1.la +lrwxrwxrwx root/root usr/lib/libsvn_fs_x-1.so -> libsvn_fs_x-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_fs_x-1.so.0 -> libsvn_fs_x-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_fs_x-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_ra-1.a +-rwxr-xr-x root/root usr/lib/libsvn_ra-1.la +lrwxrwxrwx root/root usr/lib/libsvn_ra-1.so -> libsvn_ra-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_ra-1.so.0 -> libsvn_ra-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_ra-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_ra_local-1.a +-rwxr-xr-x root/root usr/lib/libsvn_ra_local-1.la +lrwxrwxrwx root/root usr/lib/libsvn_ra_local-1.so -> libsvn_ra_local-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_ra_local-1.so.0 -> libsvn_ra_local-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_ra_local-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_ra_serf-1.a +-rwxr-xr-x root/root usr/lib/libsvn_ra_serf-1.la +lrwxrwxrwx root/root usr/lib/libsvn_ra_serf-1.so -> libsvn_ra_serf-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_ra_serf-1.so.0 -> libsvn_ra_serf-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_ra_serf-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_ra_svn-1.a +-rwxr-xr-x root/root usr/lib/libsvn_ra_svn-1.la +lrwxrwxrwx root/root usr/lib/libsvn_ra_svn-1.so -> libsvn_ra_svn-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_ra_svn-1.so.0 -> libsvn_ra_svn-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_ra_svn-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_repos-1.a +-rwxr-xr-x root/root usr/lib/libsvn_repos-1.la +lrwxrwxrwx root/root usr/lib/libsvn_repos-1.so -> libsvn_repos-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_repos-1.so.0 -> libsvn_repos-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_repos-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_subr-1.a +-rwxr-xr-x root/root usr/lib/libsvn_subr-1.la +lrwxrwxrwx root/root usr/lib/libsvn_subr-1.so -> libsvn_subr-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_subr-1.so.0 -> libsvn_subr-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_subr-1.so.0.0.0 +-rw-r--r-- root/root usr/lib/libsvn_wc-1.a +-rwxr-xr-x root/root usr/lib/libsvn_wc-1.la +lrwxrwxrwx root/root usr/lib/libsvn_wc-1.so -> libsvn_wc-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsvn_wc-1.so.0 -> libsvn_wc-1.so.0.0.0 +-rwxr-xr-x root/root usr/lib/libsvn_wc-1.so.0.0.0 +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/svn.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnadmin.1.gz +-rw-r--r-- root/root usr/share/man/man1/svndumpfilter.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnlook.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnmucc.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnrdump.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnsync.1.gz +-rw-r--r-- root/root usr/share/man/man1/svnversion.1.gz +drwxr-xr-x root/root usr/share/man/man5/ +-rw-r--r-- root/root usr/share/man/man5/svnserve.conf.5.gz +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/svnserve.8.gz +drwxr-xr-x root/root usr/share/pkgconfig/ +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_client.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_delta.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_diff.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_base.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_fs.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_util.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_x.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_local.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_serf.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_svn.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_repos.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_subr.pc +-rw-r--r-- root/root usr/share/pkgconfig/libsvn_wc.pc diff --git a/subversion/.signature b/subversion/.signature new file mode 100644 index 00000000..1424c896 --- /dev/null +++ b/subversion/.signature @@ -0,0 +1,5 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF3xQmyFlcMWetnVZNda3y58ZLOEfDeRUv6wJ36dlp5wIcKTX0FE9+y6qeFq9fFClhMz4qtIxZHinAqJAmVZkEXQs= +SHA256 (Pkgfile) = c121840963e3bb1a7154a30c7d287359675c7822affa87fe1776fbadde6fafa4 +SHA256 (.footprint) = d00adb73926ccd556c7d37d069fab96f98fc85d028fbc291ddc9c9a9fee0e931 +SHA256 (subversion-1.9.12.tar.bz2) = 3c3a15fd73a21ab55556d7c291cf40e25ade1c070294504aa50b4767db1be397 diff --git a/subversion/Pkgfile b/subversion/Pkgfile new file mode 100644 index 00000000..08b2a1a1 --- /dev/null +++ b/subversion/Pkgfile @@ -0,0 +1,27 @@ +# Description: A version control system (CVS replacement) +# URL: http://subversion.apache.org +# Maintainer: John Vogel, jvogel4 at stny dot rr dot com +# Depends on: serf + +name=subversion +version=1.9.12 +release=1 +source=(https://www.apache.org/dist/$name/$name-$version.tar.bz2) + +build() { + cd $name-$version + + ./configure --prefix=/usr \ + --with-apr=/usr \ + --with-apr-util=/usr \ + --without-swig \ + --without-apxs \ + --disable-mod-activation \ + --disable-nls + + make + make -j1 DESTDIR=$PKG install + + # info pages seem to get generated when makeinfo is available + rm -rf $PKG/usr/info +} diff --git a/subversion/README b/subversion/README new file mode 100644 index 00000000..b74b469c --- /dev/null +++ b/subversion/README @@ -0,0 +1,41 @@ +NOTES + +This is a port for the subversion revision control; if you have apache +(version 2.0+) installed, you'll also get the apache modules to run a +subversion server via apache/WebDAV. +Else you'll still be able to create a server with the svnserve +application. If you want absolutely no server parts, add +"--without-berkeley-db" to the configure line + +If you're going to install apache later on, you'll need to recompile +this package (solutions to this are already planned). + +If you want Python Bindings, install SWIG and comment out the few lines +in the build() function + +PRE-INSTALL (SERVER) +Make sure you install expat before you install apache; also, note that you'll +get a footprint missmatch + + +POST-INSTALL (SERVER) + +add something like this to your apache configuration: + +#LoadModule dav_module lib/apache/mod_dav.so +#LoadModule dav_svn_module lib/apache/mod_dav_svn.so +#<Location /svn/repos> +# DAV svn +# SVNPath /home/svnroot +# +# # Limit write permission to list of valid users. +# <LimitExcept GET PROPFIND OPTIONS REPORT> +# # Require SSL connection for password protection. +# # SSLRequireSSL +# +# AuthType Basic +# AuthName "Authorization Realm" +# AuthUserFile /absolute/path/to/passwdfile +# Require valid-user +# </LimitExcept> +#</Location>

1 0

ports/opt (3.5): [notify] subversion: dropped unmaintained and vulnerable port
by crux＠crux.nu 01 Aug '19

01 Aug '19

commit fba20604cab206f2aae1628867429516ddfd4d2c Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Thu Aug 1 20:27:39 2019 +0200 [notify] subversion: dropped unmaintained and vulnerable port diff --git a/subversion/.footprint b/subversion/.footprint deleted file mode 100644 index 29b9ccc33..000000000 --- a/subversion/.footprint +++ /dev/null @@ -1,167 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ --rwxr-xr-x root/root usr/bin/svn --rwxr-xr-x root/root usr/bin/svnadmin --rwxr-xr-x root/root usr/bin/svnbench --rwxr-xr-x root/root usr/bin/svndumpfilter --rwxr-xr-x root/root usr/bin/svnfsfs --rwxr-xr-x root/root usr/bin/svnlook --rwxr-xr-x root/root usr/bin/svnmucc --rwxr-xr-x root/root usr/bin/svnrdump --rwxr-xr-x root/root usr/bin/svnserve --rwxr-xr-x root/root usr/bin/svnsync --rwxr-xr-x root/root usr/bin/svnversion -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/subversion-1/ --rw-r--r-- root/root usr/include/subversion-1/mod_authz_svn.h --rw-r--r-- root/root usr/include/subversion-1/mod_dav_svn.h --rw-r--r-- root/root usr/include/subversion-1/svn-revision.txt --rw-r--r-- root/root usr/include/subversion-1/svn_auth.h --rw-r--r-- root/root usr/include/subversion-1/svn_base64.h --rw-r--r-- root/root usr/include/subversion-1/svn_cache_config.h --rw-r--r-- root/root usr/include/subversion-1/svn_checksum.h --rw-r--r-- root/root usr/include/subversion-1/svn_client.h --rw-r--r-- root/root usr/include/subversion-1/svn_cmdline.h --rw-r--r-- root/root usr/include/subversion-1/svn_compat.h --rw-r--r-- root/root usr/include/subversion-1/svn_config.h --rw-r--r-- root/root usr/include/subversion-1/svn_ctype.h --rw-r--r-- root/root usr/include/subversion-1/svn_dav.h --rw-r--r-- root/root usr/include/subversion-1/svn_delta.h --rw-r--r-- root/root usr/include/subversion-1/svn_diff.h --rw-r--r-- root/root usr/include/subversion-1/svn_dirent_uri.h --rw-r--r-- root/root usr/include/subversion-1/svn_dso.h --rw-r--r-- root/root usr/include/subversion-1/svn_error.h --rw-r--r-- root/root usr/include/subversion-1/svn_error_codes.h --rw-r--r-- root/root usr/include/subversion-1/svn_fs.h --rw-r--r-- root/root usr/include/subversion-1/svn_hash.h --rw-r--r-- root/root usr/include/subversion-1/svn_io.h --rw-r--r-- root/root usr/include/subversion-1/svn_iter.h --rw-r--r-- root/root usr/include/subversion-1/svn_md5.h --rw-r--r-- root/root usr/include/subversion-1/svn_mergeinfo.h --rw-r--r-- root/root usr/include/subversion-1/svn_nls.h --rw-r--r-- root/root usr/include/subversion-1/svn_opt.h --rw-r--r-- root/root usr/include/subversion-1/svn_path.h --rw-r--r-- root/root usr/include/subversion-1/svn_pools.h --rw-r--r-- root/root usr/include/subversion-1/svn_props.h --rw-r--r-- root/root usr/include/subversion-1/svn_quoprint.h --rw-r--r-- root/root usr/include/subversion-1/svn_ra.h --rw-r--r-- root/root usr/include/subversion-1/svn_ra_svn.h --rw-r--r-- root/root usr/include/subversion-1/svn_repos.h --rw-r--r-- root/root usr/include/subversion-1/svn_sorts.h --rw-r--r-- root/root usr/include/subversion-1/svn_string.h --rw-r--r-- root/root usr/include/subversion-1/svn_subst.h --rw-r--r-- root/root usr/include/subversion-1/svn_time.h --rw-r--r-- root/root usr/include/subversion-1/svn_types.h --rw-r--r-- root/root usr/include/subversion-1/svn_user.h --rw-r--r-- root/root usr/include/subversion-1/svn_utf.h --rw-r--r-- root/root usr/include/subversion-1/svn_version.h --rw-r--r-- root/root usr/include/subversion-1/svn_wc.h --rw-r--r-- root/root usr/include/subversion-1/svn_x509.h --rw-r--r-- root/root usr/include/subversion-1/svn_xml.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libsvn_client-1.a --rwxr-xr-x root/root usr/lib/libsvn_client-1.la -lrwxrwxrwx root/root usr/lib/libsvn_client-1.so -> libsvn_client-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_client-1.so.0 -> libsvn_client-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_client-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_delta-1.a --rwxr-xr-x root/root usr/lib/libsvn_delta-1.la -lrwxrwxrwx root/root usr/lib/libsvn_delta-1.so -> libsvn_delta-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_delta-1.so.0 -> libsvn_delta-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_delta-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_diff-1.a --rwxr-xr-x root/root usr/lib/libsvn_diff-1.la -lrwxrwxrwx root/root usr/lib/libsvn_diff-1.so -> libsvn_diff-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_diff-1.so.0 -> libsvn_diff-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_diff-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_fs-1.a --rwxr-xr-x root/root usr/lib/libsvn_fs-1.la -lrwxrwxrwx root/root usr/lib/libsvn_fs-1.so -> libsvn_fs-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_fs-1.so.0 -> libsvn_fs-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_fs-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_fs_base-1.a --rwxr-xr-x root/root usr/lib/libsvn_fs_base-1.la -lrwxrwxrwx root/root usr/lib/libsvn_fs_base-1.so -> libsvn_fs_base-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_fs_base-1.so.0 -> libsvn_fs_base-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_fs_base-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_fs_fs-1.a --rwxr-xr-x root/root usr/lib/libsvn_fs_fs-1.la -lrwxrwxrwx root/root usr/lib/libsvn_fs_fs-1.so -> libsvn_fs_fs-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_fs_fs-1.so.0 -> libsvn_fs_fs-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_fs_fs-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_fs_util-1.a --rwxr-xr-x root/root usr/lib/libsvn_fs_util-1.la -lrwxrwxrwx root/root usr/lib/libsvn_fs_util-1.so -> libsvn_fs_util-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_fs_util-1.so.0 -> libsvn_fs_util-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_fs_util-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_fs_x-1.a --rwxr-xr-x root/root usr/lib/libsvn_fs_x-1.la -lrwxrwxrwx root/root usr/lib/libsvn_fs_x-1.so -> libsvn_fs_x-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_fs_x-1.so.0 -> libsvn_fs_x-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_fs_x-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_ra-1.a --rwxr-xr-x root/root usr/lib/libsvn_ra-1.la -lrwxrwxrwx root/root usr/lib/libsvn_ra-1.so -> libsvn_ra-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_ra-1.so.0 -> libsvn_ra-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_ra-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_ra_local-1.a --rwxr-xr-x root/root usr/lib/libsvn_ra_local-1.la -lrwxrwxrwx root/root usr/lib/libsvn_ra_local-1.so -> libsvn_ra_local-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_ra_local-1.so.0 -> libsvn_ra_local-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_ra_local-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_ra_serf-1.a --rwxr-xr-x root/root usr/lib/libsvn_ra_serf-1.la -lrwxrwxrwx root/root usr/lib/libsvn_ra_serf-1.so -> libsvn_ra_serf-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_ra_serf-1.so.0 -> libsvn_ra_serf-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_ra_serf-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_ra_svn-1.a --rwxr-xr-x root/root usr/lib/libsvn_ra_svn-1.la -lrwxrwxrwx root/root usr/lib/libsvn_ra_svn-1.so -> libsvn_ra_svn-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_ra_svn-1.so.0 -> libsvn_ra_svn-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_ra_svn-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_repos-1.a --rwxr-xr-x root/root usr/lib/libsvn_repos-1.la -lrwxrwxrwx root/root usr/lib/libsvn_repos-1.so -> libsvn_repos-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_repos-1.so.0 -> libsvn_repos-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_repos-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_subr-1.a --rwxr-xr-x root/root usr/lib/libsvn_subr-1.la -lrwxrwxrwx root/root usr/lib/libsvn_subr-1.so -> libsvn_subr-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_subr-1.so.0 -> libsvn_subr-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_subr-1.so.0.0.0 --rw-r--r-- root/root usr/lib/libsvn_wc-1.a --rwxr-xr-x root/root usr/lib/libsvn_wc-1.la -lrwxrwxrwx root/root usr/lib/libsvn_wc-1.so -> libsvn_wc-1.so.0.0.0 -lrwxrwxrwx root/root usr/lib/libsvn_wc-1.so.0 -> libsvn_wc-1.so.0.0.0 --rwxr-xr-x root/root usr/lib/libsvn_wc-1.so.0.0.0 -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/man/ -drwxr-xr-x root/root usr/share/man/man1/ --rw-r--r-- root/root usr/share/man/man1/svn.1.gz --rw-r--r-- root/root usr/share/man/man1/svnadmin.1.gz --rw-r--r-- root/root usr/share/man/man1/svndumpfilter.1.gz --rw-r--r-- root/root usr/share/man/man1/svnlook.1.gz --rw-r--r-- root/root usr/share/man/man1/svnmucc.1.gz --rw-r--r-- root/root usr/share/man/man1/svnrdump.1.gz --rw-r--r-- root/root usr/share/man/man1/svnsync.1.gz --rw-r--r-- root/root usr/share/man/man1/svnversion.1.gz -drwxr-xr-x root/root usr/share/man/man5/ --rw-r--r-- root/root usr/share/man/man5/svnserve.conf.5.gz -drwxr-xr-x root/root usr/share/man/man8/ --rw-r--r-- root/root usr/share/man/man8/svnserve.8.gz -drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/libsvn_client.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_delta.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_diff.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_base.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_fs.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_util.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_fs_x.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_local.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_serf.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_ra_svn.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_repos.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_subr.pc --rw-r--r-- root/root usr/share/pkgconfig/libsvn_wc.pc diff --git a/subversion/.signature b/subversion/.signature deleted file mode 100644 index 827d98fb8..000000000 --- a/subversion/.signature +++ /dev/null @@ -1,6 +0,0 @@ -untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/V4OB8yoTeWo2j0h21u/P85euLVdeX2Xt19Z4gBN/7TSBw4InW3RUMtGN+VR/9FsUBQQRKCW4qEUc1XtSHDOygE= -SHA256 (Pkgfile) = c56790c34aa57b0a2538eede948616dba0bac4d13381ffa2f23b36ab439f6c19 -SHA256 (.footprint) = d00adb73926ccd556c7d37d069fab96f98fc85d028fbc291ddc9c9a9fee0e931 -SHA256 (subversion-1.9.10.tar.bz2) = ae28c656535c8b817f469e6ee6951e9840ea2d64c7ff0e98c728638bb45c9cd7 -SHA256 (apr-1.7.patch) = f7b6ccd807a15e899a592a53b256f70a7651e2078453d12e0242658a180a8d64 diff --git a/subversion/Pkgfile b/subversion/Pkgfile deleted file mode 100644 index 41e3b8595..000000000 --- a/subversion/Pkgfile +++ /dev/null @@ -1,31 +0,0 @@ -# Description: A version control system (CVS replacement) -# URL: http://subversion.apache.org -# Maintainer: UNMAINTAINED -# Depends on: serf - -name=subversion -version=1.9.10 -release=1 -source=(https://www.apache.org/dist/$name/$name-$version.tar.bz2 - apr-1.7.patch) - -build() { - cd $name-$version - - patch -p1 -i $SRC/apr-1.7.patch - - ./autogen.sh - ./configure --prefix=/usr \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --without-swig \ - --without-apxs \ - --disable-mod-activation \ - --disable-nls - - make - make -j1 DESTDIR=$PKG install - - # info pages seem to get generated when makeinfo is available - rm -rf $PKG/usr/info -} diff --git a/subversion/README b/subversion/README deleted file mode 100644 index b74b469c6..000000000 --- a/subversion/README +++ /dev/null @@ -1,41 +0,0 @@ -NOTES - -This is a port for the subversion revision control; if you have apache -(version 2.0+) installed, you'll also get the apache modules to run a -subversion server via apache/WebDAV. -Else you'll still be able to create a server with the svnserve -application. If you want absolutely no server parts, add -"--without-berkeley-db" to the configure line - -If you're going to install apache later on, you'll need to recompile -this package (solutions to this are already planned). - -If you want Python Bindings, install SWIG and comment out the few lines -in the build() function - -PRE-INSTALL (SERVER) -Make sure you install expat before you install apache; also, note that you'll -get a footprint missmatch - - -POST-INSTALL (SERVER) - -add something like this to your apache configuration: - -#LoadModule dav_module lib/apache/mod_dav.so -#LoadModule dav_svn_module lib/apache/mod_dav_svn.so -#<Location /svn/repos> -# DAV svn -# SVNPath /home/svnroot -# -# # Limit write permission to list of valid users. -# <LimitExcept GET PROPFIND OPTIONS REPORT> -# # Require SSL connection for password protection. -# # SSLRequireSSL -# -# AuthType Basic -# AuthName "Authorization Realm" -# AuthUserFile /absolute/path/to/passwdfile -# Require valid-user -# </LimitExcept> -#</Location> diff --git a/subversion/apr-1.7.patch b/subversion/apr-1.7.patch deleted file mode 100644 index 7f1bdd49c..000000000 --- a/subversion/apr-1.7.patch +++ /dev/null @@ -1,101 +0,0 @@ -From d67979e61f8659af05fd4d0384a2db33645df83d Mon Sep 17 00:00:00 2001 -From: Stefan Sperling <stsp(a)apache.org> -Date: Fri, 12 Apr 2019 09:27:33 +0000 -Subject: [PATCH] Get rid of apr_int64_t format string check in swig py - configure. - -This check relied on APR implementation details and broke with APR 1.7.0. -Rather than trying to guess a perfect format string to use, just use the -largest possible format and cast the argument accordingly. - -Should fix build against APR 1.7.0 and later. - -Suggested by: brane - -* build/ac-macros/swig.m4: Remove code related to SVN_APR_INT64_T_PYCFMT. - -* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c - (svn_swig_py_client_blame_receiver_func): Stop relying on the - SVN_APR_INT64_T_PYCFMT constant from configure. Use "L" and - acast to PY_LONG_LONG instead. - - -git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1857391 13f79535-47bb-0310-9956-ffa450edef68 ---- - build/ac-macros/swig.m4 | 35 ------------------- - .../swig/python/libsvn_swig_py/swigutil_py.c | 9 +++-- - 2 files changed, 4 insertions(+), 40 deletions(-) - -diff --git a/build/ac-macros/swig.m4 b/build/ac-macros/swig.m4 -index 55501fb882f..29638727363 100644 ---- a/build/ac-macros/swig.m4 -+++ b/build/ac-macros/swig.m4 -@@ -128,41 +128,6 @@ AC_DEFUN(SVN_FIND_SWIG, - ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`" - ]) - SWIG_PY_LIBS="`SVN_REMOVE_STANDARD_LIB_DIRS($ac_cv_python_libs)`" -- -- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT -- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT -- dnl thus the egrep patterns have a + in them. -- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" -- AC_CACHE_CHECK([for apr_int64_t Python/C API format string], -- [svn_cv_pycfmt_apr_int64_t], [ -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="L"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="l"]) -- fi -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd], -- [#include <apr.h> -- MaTcHtHiS APR_INT64_T_FMT EnDeNd], -- [svn_cv_pycfmt_apr_int64_t="i"]) -- fi -- ]) -- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS" -- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then -- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this platform]) -- fi -- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT], -- ["$svn_cv_pycfmt_apr_int64_t"], -- [Define to the Python/C API format character suitable] -- [ for apr_int64_t]) - fi - - if test "$PERL" != "none"; then -diff --git a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -index 2c90a6a464d..abe5a2ab64c 100644 ---- a/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -+++ b/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c -@@ -46,7 +46,7 @@ - #include "svn_mergeinfo.h" - #include "svn_types.h" - --#include "svn_private_config.h" /* for SVN_APR_INT64_T_PYCFMT */ -+#include "svn_private_config.h" - - #include "swig_python_external_runtime.swg" - #include "swigutil_py.h" -@@ -3394,10 +3394,9 @@ svn_error_t *svn_swig_py_client_blame_receiver_func(void *baton, - svn_swig_py_acquire_py_lock(); - - if ((result = PyObject_CallFunction(receiver, -- (char *) -- (SVN_APR_INT64_T_PYCFMT "lsssO&"), -- line_no, revision, author, date, line, -- make_ob_pool, pool)) == NULL) -+ (char *)"LlsssO&", -+ (PY_LONG_LONG)line_no, revision, author, -+ date, line, make_ob_pool, pool)) == NULL) - { - err = callback_exception_error(); - }

1 0