[arch-commits] Commit in pacredir/repos/community-x86_64 (5 files)
Christian Hesse
eworm at archlinux.org
Fri Jan 1 21:14:39 UTC 2021
Date: Friday, January 1, 2021 @ 21:14:39
Author: eworm
Revision: 802869
archrelease: copy trunk to community-x86_64
Added:
pacredir/repos/community-x86_64/PKGBUILD
(from rev 802868, pacredir/trunk/PKGBUILD)
pacredir/repos/community-x86_64/pacredir.install
(from rev 802868, pacredir/trunk/pacredir.install)
Deleted:
pacredir/repos/community-x86_64/0001-fix-build-with-libmicrohttpd-0.9.71.patch
pacredir/repos/community-x86_64/PKGBUILD
pacredir/repos/community-x86_64/pacredir.install
------------------------------------------------+
0001-fix-build-with-libmicrohttpd-0.9.71.patch | 51 ----------------
PKGBUILD | 70 ++++++++++-------------
pacredir.install | 48 +++++++--------
3 files changed, 55 insertions(+), 114 deletions(-)
Deleted: 0001-fix-build-with-libmicrohttpd-0.9.71.patch
===================================================================
--- 0001-fix-build-with-libmicrohttpd-0.9.71.patch 2021-01-01 21:14:35 UTC (rev 802868)
+++ 0001-fix-build-with-libmicrohttpd-0.9.71.patch 2021-01-01 21:14:39 UTC (rev 802869)
@@ -1,51 +0,0 @@
-From f5482d8c6463c310a2b1bbab3ab3776155e16f93 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Tue, 7 Jul 2020 11:29:36 +0200
-Subject: [PATCH 1/1] fix build with libmicrohttpd 0.9.71
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- pacredir.c | 2 +-
- pacredir.h | 9 ++++++++-
- 2 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/pacredir.c b/pacredir.c
-index 1f16804..2fa806f 100644
---- a/pacredir.c
-+++ b/pacredir.c
-@@ -343,7 +343,7 @@ static void * get_http_code(void * data) {
-
- /*** ahc_echo ***
- * called whenever a http request is received */
--static int ahc_echo(void * cls,
-+static mhd_result ahc_echo(void * cls,
- struct MHD_Connection * connection,
- const char * uri,
- const char * method,
-diff --git a/pacredir.h b/pacredir.h
-index d165ee8..a38eb9f 100644
---- a/pacredir.h
-+++ b/pacredir.h
-@@ -44,6 +44,13 @@
-
- #define PROGNAME "pacredir"
-
-+/* libmicrohttpd compat */
-+#if MHD_VERSION >= 0x00097002
-+# define mhd_result enum MHD_Result
-+#else
-+# define mhd_result int
-+#endif
-+
- /* hosts */
- struct hosts {
- /* host name */
-@@ -130,7 +137,7 @@ static void client_callback(AvahiClient *c,
- /* get_http_code */
- static void * get_http_code(void * data);
- /* ahc_echo */
--static int ahc_echo(void * cls,
-+static mhd_result ahc_echo(void * cls,
- struct MHD_Connection * connection,
- const char * uri,
- const char * method,
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-01-01 21:14:35 UTC (rev 802868)
+++ PKGBUILD 2021-01-01 21:14:39 UTC (rev 802869)
@@ -1,39 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-
-pkgname=pacredir
-pkgver=0.4.2
-pkgrel=2
-pkgdesc='redirect pacman requests, assisted by avahi service discovery'
-arch=('x86_64')
-url='https://github.com/eworm-de/pacredir'
-depends=('systemd-libs' 'avahi' 'curl' 'iniparser' 'darkhttpd' 'libmicrohttpd')
-makedepends=('systemd' 'markdown')
-conflicts=('pacserve')
-license=('GPL')
-install=pacredir.install
-backup=('etc/pacredir.conf' 'etc/pacman.d/pacredir')
-validpgpkeys=('BD84DE71F493DF6814B0167254EDC91609BC9183') # Christian Hesse <mail at eworm.de>
-source=("https://www.eworm.de/download/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}
- '0001-fix-build-with-libmicrohttpd-0.9.71.patch')
-sha256sums=('e2fb8478cfbca7322bb95f146d0fdb64017306f44af22c29651c05e0103dd0da'
- 'SKIP'
- '0d82ebeb5d4520290e0490dc1a71e503d2a8ad36adfe0a8cebf5c5b851676aea')
-
-prepare() {
- cd ${pkgname}-${pkgver}/
-
- patch -Np1 < ../0001-fix-build-with-libmicrohttpd-0.9.71.patch
-}
-
-build() {
- cd ${pkgname}-${pkgver}/
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}/
-
- make DESTDIR="${pkgdir}" install
-}
-
Copied: pacredir/repos/community-x86_64/PKGBUILD (from rev 802868, pacredir/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-01-01 21:14:39 UTC (rev 802869)
@@ -0,0 +1,31 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+
+pkgname=pacredir
+pkgver=0.4.3
+pkgrel=1
+pkgdesc='redirect pacman requests, assisted by avahi service discovery'
+arch=('x86_64')
+url='https://github.com/eworm-de/pacredir'
+depends=('systemd-libs' 'avahi' 'curl' 'iniparser' 'darkhttpd' 'libmicrohttpd')
+makedepends=('systemd' 'markdown')
+conflicts=('pacserve')
+license=('GPL')
+install=pacredir.install
+backup=('etc/pacredir.conf' 'etc/pacman.d/pacredir')
+validpgpkeys=('BD84DE71F493DF6814B0167254EDC91609BC9183') # Christian Hesse <mail at eworm.de>
+source=("https://www.eworm.de/download/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha256sums=('56be3b7763c4b007d77befd1cfb5d4c94f15433b883a36b7b7aec31da9d4ab4d'
+ 'SKIP')
+
+build() {
+ cd ${pkgname}-${pkgver}/
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/
+
+ make DESTDIR="${pkgdir}" install
+}
+
Deleted: pacredir.install
===================================================================
--- pacredir.install 2021-01-01 21:14:35 UTC (rev 802868)
+++ pacredir.install 2021-01-01 21:14:39 UTC (rev 802869)
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-post_install() {
- echo " > For instructions visit: https://github.com/eworm-de/pacredir#usage"
-}
-
-pre_upgrade() {
- # return if old package version greater 0.4...
- (( $(vercmp $2 '0.4') > 0 )) && return
-
- # upgrade from pre-0.4 version, pacdbserve.service no longer exists
- if systemctl is-enabled -q pacdbserve.service; then
- systemctl disable -q pacdbserve.service
- fi
-}
-
-post_upgrade() {
- # return if old package version greater 0.4...
- (( $(vercmp $2 '0.4') > 0 )) && return
-
- # upgrade from pre-0.4 version, avahi service names changed
- echo " > This upgrade from pacredir $2 to pacredir $1 changes avahi service"
- echo " > names. Make sure to update all your installations for compatibility."
-}
Copied: pacredir/repos/community-x86_64/pacredir.install (from rev 802868, pacredir/trunk/pacredir.install)
===================================================================
--- pacredir.install (rev 0)
+++ pacredir.install 2021-01-01 21:14:39 UTC (rev 802869)
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+post_install() {
+ echo " > For instructions visit: https://github.com/eworm-de/pacredir#usage"
+}
+
+pre_upgrade() {
+ # return if old package version greater 0.4...
+ (( $(vercmp $2 '0.4') > 0 )) && return
+
+ # upgrade from pre-0.4 version, pacdbserve.service no longer exists
+ if systemctl is-enabled -q pacdbserve.service; then
+ systemctl disable -q pacdbserve.service
+ fi
+}
+
+post_upgrade() {
+ # return if old package version greater 0.4...
+ (( $(vercmp $2 '0.4') > 0 )) && return
+
+ # upgrade from pre-0.4 version, avahi service names changed
+ echo " > This upgrade from pacredir $2 to pacredir $1 changes avahi service"
+ echo " > names. Make sure to update all your installations for compatibility."
+}
More information about the arch-commits
mailing list