From 34a14f436e510456d8753b2fe6a314be2bdb0649 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sun, 4 Feb 2018 21:13:55 +0100 Subject: pcr/xsp: moved from libre/xsp; gone from arch and moved to aur --- libre/xsp/PKGBUILD | 61 -------------------------------------------------- libre/xsp/xsp.install | 37 ------------------------------ libre/xsp/xsp.service | 8 ------- libre/xsp/xsp.webapp | 8 ------- pcr/xsp/PKGBUILD | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ pcr/xsp/xsp.install | 37 ++++++++++++++++++++++++++++++ pcr/xsp/xsp.service | 8 +++++++ pcr/xsp/xsp.webapp | 8 +++++++ 8 files changed, 115 insertions(+), 114 deletions(-) delete mode 100644 libre/xsp/PKGBUILD delete mode 100644 libre/xsp/xsp.install delete mode 100644 libre/xsp/xsp.service delete mode 100644 libre/xsp/xsp.webapp create mode 100644 pcr/xsp/PKGBUILD create mode 100644 pcr/xsp/xsp.install create mode 100644 pcr/xsp/xsp.service create mode 100644 pcr/xsp/xsp.webapp diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD deleted file mode 100644 index e5a4f51cf..000000000 --- a/libre/xsp/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $ -# Maintainer (Arch): Daniel Isenmann -# Contributor (Arch): Tobias Kieslich -# Maintainer: Omar Vega Ramos - -pkgname=xsp -pkgver=4.4 -pkgrel=2.parabola1 -pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)" -arch=('i686' 'x86_64' 'armv7h') -license=('custom') -url="http://www.go-mono.com" -depends=('mono' 'sqlite') -options=(!makeflags) -replaces=(${pkgname}-parabola) -conflicts=(${pkgname}-parabola) -install=${pkgname}.install -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mono/xsp/archive/${pkgver}.tar.gz - ${pkgname}.webapp - ${pkgname}.service) -sha256sums=('231d05550311a47b805331326078f156aa673ae542d2edeb14cc5ab8c34eb1a2' - 'bcb208c3946ef49ae431a7be50c8effeb61228574b56d36e2c3c1cd9fe04fe02' - '4760b3fa782e62890291c7d31e393ee51d18015f91a6fc21b4a928bae4f22f66') - -build() { - # get rid of that .wapi errors; thanks to brice - export MONO_SHARED_DIR=${srcdir}/src/weird - mkdir -p "${MONO_SHARED_DIR}" - # import pathes - # build - cd ${srcdir}/${pkgname}-${pkgver} - #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in - ./autogen.sh - ./configure --prefix=/usr --sysconfdir=/etc - make - # tweak the xsp shellscript to grab system dll's - for script in scripts/*2; do - sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script - done - #destdir related bugfixes - sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile - sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir}/ install - # move test files from share to arch' default html home - mkdir -p ${pkgdir}/srv/http/html - mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp - rm -rf ${pkgdir}/usr/share - chown -R http:http ${pkgdir}/srv/http/html/${pkgname} - - # install a xsp configuration home - install -D -m644 ${srcdir}/${pkgname}.webapp \ - ${pkgdir}/etc/${pkgname}/${pkgname}.webapp - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING - # install systemd service file - install -D -m644 ${srcdir}/${pkgname}.service \ - ${pkgdir}/usr/lib/systemd/system/xsp.service -} diff --git a/libre/xsp/xsp.install b/libre/xsp/xsp.install deleted file mode 100644 index d2cc5955a..000000000 --- a/libre/xsp/xsp.install +++ /dev/null @@ -1,37 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - ---> xsp is just the helping app for mod_mono if you like a production like ---> server. xsp itself is for ASP testing mainly -- read the manpage for xsp ---> to know which options are available. ---> Parabola will provide xsp configured by a .webapp configuration file ---> which rests in /etc/xsp. Just put your other webapp files there to let ---> xsp pick them up. ---> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all ---> your arguments there. Don't forget that you can run xsp from the console ---> as oridinary user, which is safer and for testing absolutely sufficient!! - ---> You can run the testpages simply by starting the server and calling - http://localhost:8080 ---> from your browser's location bar - - -EOM -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - /bin/true -} - -# arg 1: the old package version -post_remove() { - /bin/true -} diff --git a/libre/xsp/xsp.service b/libre/xsp/xsp.service deleted file mode 100644 index 36b802e21..000000000 --- a/libre/xsp/xsp.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=XSP Web Server - -[Service] -ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop - -[Install] -WantedBy=multi-user.target diff --git a/libre/xsp/xsp.webapp b/libre/xsp/xsp.webapp deleted file mode 100644 index a685dd171..000000000 --- a/libre/xsp/xsp.webapp +++ /dev/null @@ -1,8 +0,0 @@ - - - Root - / - /srv/http/html/xsp - localhost - - diff --git a/pcr/xsp/PKGBUILD b/pcr/xsp/PKGBUILD new file mode 100644 index 000000000..face7e27e --- /dev/null +++ b/pcr/xsp/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 308160 2017-10-17 17:36:56Z jelle $ +# Maintainer (AUR): Daniel Isenmann +# Contributor (AUR): Tobias Kieslich +# Maintainer: Omar Vega Ramos + +# parabola changes and rationale: +# - rebranded to parabola + +pkgname=xsp +pkgver=4.4 +pkgrel=2.parabola2 +pkgdesc="A simple webserver based on mono - provides ASP.NET support (Parabola rebranded)" +arch=('i686' 'x86_64' 'armv7h') +license=('custom') +url="http://www.go-mono.com" +depends=('mono' 'sqlite') +options=(!makeflags) +install=${pkgname}.install +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mono/xsp/archive/${pkgver}.tar.gz + ${pkgname}.webapp + ${pkgname}.service) +sha256sums=('231d05550311a47b805331326078f156aa673ae542d2edeb14cc5ab8c34eb1a2' + 'bcb208c3946ef49ae431a7be50c8effeb61228574b56d36e2c3c1cd9fe04fe02' + '4760b3fa782e62890291c7d31e393ee51d18015f91a6fc21b4a928bae4f22f66') + +build() { + # get rid of that .wapi errors; thanks to brice + export MONO_SHARED_DIR=${srcdir}/src/weird + mkdir -p "${MONO_SHARED_DIR}" + # import pathes + # build + cd ${srcdir}/${pkgname}-${pkgver} + #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in + ./autogen.sh + ./configure --prefix=/usr --sysconfdir=/etc + make + # tweak the xsp shellscript to grab system dll's + for script in scripts/*2; do + sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script + done + #destdir related bugfixes + sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile + sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install + # move test files from share to arch' default html home + mkdir -p ${pkgdir}/srv/http/html + mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp + rm -rf ${pkgdir}/usr/share + chown -R http:http ${pkgdir}/srv/http/html/${pkgname} + + # install a xsp configuration home + install -D -m644 ${srcdir}/${pkgname}.webapp \ + ${pkgdir}/etc/${pkgname}/${pkgname}.webapp + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + # install systemd service file + install -D -m644 ${srcdir}/${pkgname}.service \ + ${pkgdir}/usr/lib/systemd/system/xsp.service +} diff --git a/pcr/xsp/xsp.install b/pcr/xsp/xsp.install new file mode 100644 index 000000000..d2cc5955a --- /dev/null +++ b/pcr/xsp/xsp.install @@ -0,0 +1,37 @@ +# arg 1: the new package version +post_install() { + cat << EOM + +--> xsp is just the helping app for mod_mono if you like a production like +--> server. xsp itself is for ASP testing mainly -- read the manpage for xsp +--> to know which options are available. +--> Parabola will provide xsp configured by a .webapp configuration file +--> which rests in /etc/xsp. Just put your other webapp files there to let +--> xsp pick them up. +--> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all +--> your arguments there. Don't forget that you can run xsp from the console +--> as oridinary user, which is safer and for testing absolutely sufficient!! + +--> You can run the testpages simply by starting the server and calling + http://localhost:8080 +--> from your browser's location bar + + +EOM +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/pcr/xsp/xsp.service b/pcr/xsp/xsp.service new file mode 100644 index 000000000..36b802e21 --- /dev/null +++ b/pcr/xsp/xsp.service @@ -0,0 +1,8 @@ +[Unit] +Description=XSP Web Server + +[Service] +ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop + +[Install] +WantedBy=multi-user.target diff --git a/pcr/xsp/xsp.webapp b/pcr/xsp/xsp.webapp new file mode 100644 index 000000000..a685dd171 --- /dev/null +++ b/pcr/xsp/xsp.webapp @@ -0,0 +1,8 @@ + + + Root + / + /srv/http/html/xsp + localhost + + -- cgit v1.2.3