Date: Tuesday, December 27, 2022 @ 15:51:47
Author: heftig
Revision: 465038
archrelease: copy trunk to extra-x86_64
Added:
pacrunner/repos/extra-x86_64/PKGBUILD
(from rev 465037, pacrunner/trunk/PKGBUILD)
pacrunner/repos/extra-x86_64/duktape-shared.diff
(from rev 465037, pacrunner/trunk/duktape-shared.diff)
Deleted:
pacrunner/repos/extra-x86_64/PKGBUILD
pacrunner/repos/extra-x86_64/duktape-shared.diff
---------------------+
PKGBUILD | 151 +++++++++++++++----------------
duktape-shared.diff | 240 +++++++++++++++++++++++++-------------------------
2 files changed, 196 insertions(+), 195 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-27 15:51:40 UTC (rev 465037)
+++ PKGBUILD 2022-12-27 15:51:47 UTC (rev 465038)
@@ -1,75 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
-
-pkgname=pacrunner
-pkgver=0.19
-pkgrel=1
-pkgdesc="Proxy configuration daemon"
-arch=(x86_64)
-url="https://git.kernel.org/pub/scm/network/connman/pacrunner.git";
-license=(GPL2 LGPL2.1)
-depends=(glib2 dbus curl duktape)
-makedepends=(git)
-_commit=bb888a1f99cc05d63bd61b65cad7026feea92a4e # tags/0.19^0
-source=("git+https://git.kernel.org/pub/scm/network/connman/pacrunner.git#commit=$_commit";
- duktape-shared.diff)
-sha256sums=('SKIP'
- '2cbb148bc7cd72230a1aa465c806260eb0fc1dd47d8663b2b48d25cc29622d02')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd $pkgname
-
- # Use our system duktape
- git apply -3 ../duktape-shared.diff
-
- ./bootstrap
-}
-
-build() {
- cd $pkgname
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --sbindir=/usr/bin \
- --libexecdir=/usr/lib \
- --with-dbusconfdir=/usr/share \
- --enable-pie \
- --enable-duktape \
- --enable-curl
- make
-}
-
-package() {
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- install -Dm644 /dev/stdin "$pkgdir/usr/lib/systemd/system/pacrunner.service"
<<END
-[Unit]
-Description=Proxy configuration daemon
-Before=network.target
-Wants=network.target
-
-[Service]
-Type=dbus
-BusName=org.pacrunner
-ExecStart=/usr/bin/pacrunner
-
-[Install]
-WantedBy=multi-user.target
-END
-
- install -Dm644 /dev/stdin
"$pkgdir/usr/share/dbus-1/system-services/org.pacrunner.service" <<END
-[D-BUS Service]
-Name=org.pacrunner
-Exec=/usr/bin/pacrunner
-User=root
-SystemdService=pacrunner.service
-END
-}
-
-# vim:set sw=2 sts=-1 et:
Copied: pacrunner/repos/extra-x86_64/PKGBUILD (from rev 465037,
pacrunner/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-12-27 15:51:47 UTC (rev 465038)
@@ -0,0 +1,76 @@
+# Maintainer: Jan Alexander Steffens (heftig) <[email protected]>
+
+pkgname=pacrunner
+pkgver=0.19
+pkgrel=2
+pkgdesc="Proxy configuration daemon"
+arch=(x86_64)
+url="https://git.kernel.org/pub/scm/network/connman/pacrunner.git";
+license=(GPL2 LGPL2.1)
+depends=(glib2 dbus curl duktape)
+makedepends=(git)
+options=(debug)
+_commit=bb888a1f99cc05d63bd61b65cad7026feea92a4e # tags/0.19^0
+source=("git+https://git.kernel.org/pub/scm/network/connman/pacrunner.git#commit=$_commit";
+ duktape-shared.diff)
+sha256sums=('SKIP'
+ '2cbb148bc7cd72230a1aa465c806260eb0fc1dd47d8663b2b48d25cc29622d02')
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $pkgname
+
+ # Use our system duktape
+ git apply -3 ../duktape-shared.diff
+
+ ./bootstrap
+}
+
+build() {
+ cd $pkgname
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/bin \
+ --libexecdir=/usr/lib \
+ --with-dbusconfdir=/usr/share \
+ --enable-pie \
+ --enable-duktape \
+ --enable-curl
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/systemd/system/pacrunner.service"
<<END
+[Unit]
+Description=Proxy configuration daemon
+Before=network.target
+Wants=network.target
+
+[Service]
+Type=dbus
+BusName=org.pacrunner
+ExecStart=/usr/bin/pacrunner
+
+[Install]
+WantedBy=multi-user.target
+END
+
+ install -Dm644 /dev/stdin
"$pkgdir/usr/share/dbus-1/system-services/org.pacrunner.service" <<END
+[D-BUS Service]
+Name=org.pacrunner
+Exec=/usr/bin/pacrunner
+User=root
+SystemdService=pacrunner.service
+END
+}
+
+# vim:set sw=2 sts=-1 et:
Deleted: duktape-shared.diff
===================================================================
--- duktape-shared.diff 2022-12-27 15:51:40 UTC (rev 465037)
+++ duktape-shared.diff 2022-12-27 15:51:47 UTC (rev 465038)
@@ -1,120 +0,0 @@
- Makefile.am | 23 ++++++++++++++++++-----
- configure.ac | 11 ++++++++++-
- 2 files changed, 28 insertions(+), 6 deletions(-)
-
-diff --git c/Makefile.am i/Makefile.am
-index 819abab..964f4c2 100644
---- c/Makefile.am
-+++ i/Makefile.am
-@@ -28,20 +28,28 @@ builtin_cflags += @CURL_CFLAGS@
- builtin_libadd += @CURL_LIBS@
- endif
-
--if DUKTAPE
-+if DUKTAPE_STATIC
- js_sources = src/js_funcs.c
- builtin_modules += duktape
- builtin_sources += plugins/duktape.c
- builtin_libadd += duktape/libduktape.a -lm
-
- noinst_LIBRARIES += duktape/libduktape.a
-
- duktape_libduktape_a_SOURCES = duktape/duk_config.h \
- duktape/duktape.h \
- duktape/duktape.c
--endif
-
- duktape_libduktape_a_SHORTNAME = libduktape
-+endif
-+
-+if DUKTAPE_SHARED
-+js_sources = src/js_funcs.c
-+builtin_modules += duktape
-+builtin_sources += plugins/duktape.c
-+builtin_cflags += @DUKTAPE_CFLAGS@
-+builtin_libadd += @DUKTAPE_LIBS@ -lm
-+endif
-
- sbin_PROGRAMS = src/pacrunner
-
-@@ -102,50 +110,55 @@ noinst_PROGRAMS = unit/test-pacrunner
- unit_test_pacrunner_SOURCES = unit/test-pacrunner.c src/pacrunner.h \
- src/proxy.c src/manual.c src/download.c \
- src/js.c src/log.c src/plugin.c $(js_sources)
--
- unit_test_pacrunner_LDADD = @GLIB_LIBS@ @CUNIT_LIBS@ -ldl
-
- if CURL
-
- unit_test_pacrunner_SOURCES += plugins/curl.c
-
- unit_test_pacrunner_LDADD += @CURL_LIBS@
-
- endif
-
--if DUKTAPE
-+if DUKTAPE_STATIC
- unit_test_pacrunner_SOURCES += plugins/duktape.c
-
- unit_test_pacrunner_LDADD += duktape/libduktape.a -lm
- endif
-
-+if DUKTAPE_SHARED
-+unit_test_pacrunner_SOURCES += plugins/duktape.c
-+
-+unit_test_pacrunner_LDADD += @DUKTAPE_LIBS@ -lm
-+endif
-+
- endif #UNIT
-
- AM_CFLAGS = @GLIB_CFLAGS@ @PTHREAD_LIBS@ @DBUS_CFLAGS@ @CUNIT_CFLAGS@ \
- $(builtin_cflags) \
- -DPACRUNNER_PLUGIN_BUILTIN \
- -DPLUGINDIR=\""$(plugindir)"\"
-
- AM_CXXFLAGS = $(AM_CFLAGS) -fno-exceptions
-
- AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus
-
- test_scripts = test/find-proxy-for-url test/create-proxy-config
-
- if TEST
- testdir = $(pkglibdir)/test
- test_SCRIPTS = $(test_scripts)
- endif
-
- CLEANFILES = src/builtin.h
-
- EXTRA_DIST = src/genbuiltin src/pacrunner.conf $(test_scripts) \
- doc/architecture.txt doc/libproxy.txt \
- doc/manager-api.txt doc/client-api.txt \
- doc/manual-configuration.txt
-
- DISTCHECK_CONFIGURE_FLAGS = --enable-libproxy --disable-datafiles \
-- --enable-duktape --enable-curl
-+ --enable-duktape=static --enable-curl
-
- MAINTAINERCLEANFILES = Makefile.in \
- aclocal.m4 configure config.h.in config.sub config.guess \
-diff --git c/configure.ac i/configure.ac
-index 0f041bd..971d2d1 100644
---- c/configure.ac
-+++ i/configure.ac
-@@ -67,7 +67,16 @@ AC_ARG_ENABLE(pie, AS_HELP_STRING([--enable-pie],
-
- AC_ARG_ENABLE(duktape, AS_HELP_STRING([--enable-duktape],
- [enable Duktape Javascript plugin support]))
--AM_CONDITIONAL(DUKTAPE, test "${enable_duktape}" = "yes")
-+if (test "${enable_duktape}" = "yes"); then
-+ DUKTAPE_CFLAGS=""
-+ DUKTAPE_LIBS=""
-+ PKG_CHECK_MODULES(DUKTAPE, duktape >= 2.7.0, enable_duktape=shared,
-+ enable_duktape=static)
-+ AC_SUBST(DUKTAPE_CFLAGS)
-+ AC_SUBST(DUKTAPE_LIBS)
-+fi
-+AM_CONDITIONAL(DUKTAPE_STATIC, test "${enable_duktape}" = "static")
-+AM_CONDITIONAL(DUKTAPE_SHARED, test "${enable_duktape}" = "shared")
-
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
- AC_MSG_ERROR(GLib >= 2.16 is required))
Copied: pacrunner/repos/extra-x86_64/duktape-shared.diff (from rev 465037,
pacrunner/trunk/duktape-shared.diff)
===================================================================
--- duktape-shared.diff (rev 0)
+++ duktape-shared.diff 2022-12-27 15:51:47 UTC (rev 465038)
@@ -0,0 +1,120 @@
+ Makefile.am | 23 ++++++++++++++++++-----
+ configure.ac | 11 ++++++++++-
+ 2 files changed, 28 insertions(+), 6 deletions(-)
+
+diff --git c/Makefile.am i/Makefile.am
+index 819abab..964f4c2 100644
+--- c/Makefile.am
++++ i/Makefile.am
+@@ -28,20 +28,28 @@ builtin_cflags += @CURL_CFLAGS@
+ builtin_libadd += @CURL_LIBS@
+ endif
+
+-if DUKTAPE
++if DUKTAPE_STATIC
+ js_sources = src/js_funcs.c
+ builtin_modules += duktape
+ builtin_sources += plugins/duktape.c
+ builtin_libadd += duktape/libduktape.a -lm
+
+ noinst_LIBRARIES += duktape/libduktape.a
+
+ duktape_libduktape_a_SOURCES = duktape/duk_config.h \
+ duktape/duktape.h \
+ duktape/duktape.c
+-endif
+
+ duktape_libduktape_a_SHORTNAME = libduktape
++endif
++
++if DUKTAPE_SHARED
++js_sources = src/js_funcs.c
++builtin_modules += duktape
++builtin_sources += plugins/duktape.c
++builtin_cflags += @DUKTAPE_CFLAGS@
++builtin_libadd += @DUKTAPE_LIBS@ -lm
++endif
+
+ sbin_PROGRAMS = src/pacrunner
+
+@@ -102,50 +110,55 @@ noinst_PROGRAMS = unit/test-pacrunner
+ unit_test_pacrunner_SOURCES = unit/test-pacrunner.c src/pacrunner.h \
+ src/proxy.c src/manual.c src/download.c \
+ src/js.c src/log.c src/plugin.c $(js_sources)
+-
+ unit_test_pacrunner_LDADD = @GLIB_LIBS@ @CUNIT_LIBS@ -ldl
+
+ if CURL
+
+ unit_test_pacrunner_SOURCES += plugins/curl.c
+
+ unit_test_pacrunner_LDADD += @CURL_LIBS@
+
+ endif
+
+-if DUKTAPE
++if DUKTAPE_STATIC
+ unit_test_pacrunner_SOURCES += plugins/duktape.c
+
+ unit_test_pacrunner_LDADD += duktape/libduktape.a -lm
+ endif
+
++if DUKTAPE_SHARED
++unit_test_pacrunner_SOURCES += plugins/duktape.c
++
++unit_test_pacrunner_LDADD += @DUKTAPE_LIBS@ -lm
++endif
++
+ endif #UNIT
+
+ AM_CFLAGS = @GLIB_CFLAGS@ @PTHREAD_LIBS@ @DBUS_CFLAGS@ @CUNIT_CFLAGS@ \
+ $(builtin_cflags) \
+ -DPACRUNNER_PLUGIN_BUILTIN \
+ -DPLUGINDIR=\""$(plugindir)"\"
+
+ AM_CXXFLAGS = $(AM_CFLAGS) -fno-exceptions
+
+ AM_CPPFLAGS = -I$(builddir)/src -I$(srcdir)/src -I$(srcdir)/gdbus
+
+ test_scripts = test/find-proxy-for-url test/create-proxy-config
+
+ if TEST
+ testdir = $(pkglibdir)/test
+ test_SCRIPTS = $(test_scripts)
+ endif
+
+ CLEANFILES = src/builtin.h
+
+ EXTRA_DIST = src/genbuiltin src/pacrunner.conf $(test_scripts) \
+ doc/architecture.txt doc/libproxy.txt \
+ doc/manager-api.txt doc/client-api.txt \
+ doc/manual-configuration.txt
+
+ DISTCHECK_CONFIGURE_FLAGS = --enable-libproxy --disable-datafiles \
+- --enable-duktape --enable-curl
++ --enable-duktape=static --enable-curl
+
+ MAINTAINERCLEANFILES = Makefile.in \
+ aclocal.m4 configure config.h.in config.sub config.guess \
+diff --git c/configure.ac i/configure.ac
+index 0f041bd..971d2d1 100644
+--- c/configure.ac
++++ i/configure.ac
+@@ -67,7 +67,16 @@ AC_ARG_ENABLE(pie, AS_HELP_STRING([--enable-pie],
+
+ AC_ARG_ENABLE(duktape, AS_HELP_STRING([--enable-duktape],
+ [enable Duktape Javascript plugin support]))
+-AM_CONDITIONAL(DUKTAPE, test "${enable_duktape}" = "yes")
++if (test "${enable_duktape}" = "yes"); then
++ DUKTAPE_CFLAGS=""
++ DUKTAPE_LIBS=""
++ PKG_CHECK_MODULES(DUKTAPE, duktape >= 2.7.0, enable_duktape=shared,
++ enable_duktape=static)
++ AC_SUBST(DUKTAPE_CFLAGS)
++ AC_SUBST(DUKTAPE_LIBS)
++fi
++AM_CONDITIONAL(DUKTAPE_STATIC, test "${enable_duktape}" = "static")
++AM_CONDITIONAL(DUKTAPE_SHARED, test "${enable_duktape}" = "shared")
+
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, dummy=yes,
+ AC_MSG_ERROR(GLib >= 2.16 is required))
