From 06fa5f6dcb43ddcca329a1fc04ce02ab63146a5a Mon Sep 17 00:00:00 2001 From: John Date: Sat, 13 Feb 2021 21:59:35 +0100 Subject: [PATCH] burp-server: remove package broken with OpenSSL-1.1+ we also have burp2, so need to keep the old package around --- srcpkgs/burp-client | 1 - srcpkgs/burp-server/files/burp-server/run | 2 - srcpkgs/burp-server/patches/00.burp_ca.patch | 13 ---- .../patches/fix-gcc6-narrowing.patch | 49 --------------- srcpkgs/burp-server/template | 62 ------------------- srcpkgs/burp-server/update | 2 - srcpkgs/removed-packages/template | 2 + 7 files changed, 2 insertions(+), 129 deletions(-) delete mode 120000 srcpkgs/burp-client delete mode 100755 srcpkgs/burp-server/files/burp-server/run delete mode 100644 srcpkgs/burp-server/patches/00.burp_ca.patch delete mode 100644 srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch delete mode 100644 srcpkgs/burp-server/template delete mode 100644 srcpkgs/burp-server/update diff --git a/srcpkgs/burp-client b/srcpkgs/burp-client deleted file mode 120000 index 47843b7b980..00000000000 --- a/srcpkgs/burp-client +++ /dev/null @@ -1 +0,0 @@ -burp-server \ No newline at end of file diff --git a/srcpkgs/burp-server/files/burp-server/run b/srcpkgs/burp-server/files/burp-server/run deleted file mode 100755 index 14e3188c6f0..00000000000 --- a/srcpkgs/burp-server/files/burp-server/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec burp -F -c /etc/burp/burp-server.conf diff --git a/srcpkgs/burp-server/patches/00.burp_ca.patch b/srcpkgs/burp-server/patches/00.burp_ca.patch deleted file mode 100644 index a60ddb08218..00000000000 --- a/srcpkgs/burp-server/patches/00.burp_ca.patch +++ /dev/null @@ -1,13 +0,0 @@ -# "-f" option unsupported by hostname. -# from package VoidLinux/coreutils 8.24_3 - 2015-09. ---- configs/certs/CA/burp_ca -+++ configs/certs/CA/burp_ca -@@ -11,7 +11,7 @@ - dir=${etc}/CA - conf=${etc}/CA.cnf - --name=$(hostname -f) -+name=$(hostname) - ca_days=7300 - size=2048 - diff --git a/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch b/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch deleted file mode 100644 index 14643dd215e..00000000000 --- a/srcpkgs/burp-server/patches/fix-gcc6-narrowing.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- src/conf.c.orig -+++ src/conf.c -@@ -538,7 +538,7 @@ static void do_build_regex(struct strlis - struct fstype - { - const char *str; -- long flag; -+ unsigned int flag; - }; - - static struct fstype fstypes[]={ -@@ -590,7 +590,7 @@ int main(int argc, char *argv[]) - - #endif - --static int fstype_to_flag(const char *fstype, long *flag) -+static int fstype_to_flag(const char *fstype, unsigned int *flag) - { - #ifdef HAVE_LINUX_OS - int i=0; ---- src/strlist.c.orig -+++ src/strlist.c -@@ -21,7 +21,7 @@ void strlists_free(struct strlist **bd, - } - } - --int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag) -+int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag) - { - //int b=0; - struct strlist *bdnew=NULL; ---- src/strlist.h.orig -+++ src/strlist.h -@@ -11,13 +11,13 @@ typedef struct strlist strlist_t; - - struct strlist - { -- long flag; -+ unsigned int flag; - char *path; - regex_t *re; - }; - - extern void strlists_free(struct strlist **bd, int count); --extern int strlist_add(struct strlist ***bdlist, int *count, char *path, long flag); -+extern int strlist_add(struct strlist ***bdlist, int *count, char *path, unsigned int flag); - extern int strlist_sort(struct strlist **a, struct strlist **b); - - #endif diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template deleted file mode 100644 index 85cff6602c6..00000000000 --- a/srcpkgs/burp-server/template +++ /dev/null @@ -1,62 +0,0 @@ -# Template file for 'burp-server' -_desc="A network-based backup and restore program" - -pkgname=burp-server -version=1.4.40 -revision=12 -short_desc="${_desc} - Server" -maintainer="Pierre Bourgin " -license="AGPL-3.0-only, BSD-3-Clause, GPL-2.0-or-later" -homepage="http://burp.grke.org/" -wrksrc="burp-${version}" -distfiles="https://github.com/grke/burp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f - -hostmakedepends="automake libtool perl" -# note: burp provides its internal copy of "uthash-devel" -makedepends=" - libressl-devel zlib-devel librsync-devel ncurses-devel - acl-devel yajl-devel ca-certificates" - -# unique binary for both client and server: server depends on client package. -depends="burp-client-${version}_${revision}" - -build_style=gnu-configure -configure_args="--sysconfdir=/etc/burp --sbindir=/usr/bin" -conf_files="/etc/burp/burp-server.conf" - -make_dirs="/var/spool/burp 0755 root root" - -post_install() { - vsv ${pkgname} - - vdoc "README" - vdoc "UPGRADING" - vlicense "LICENSE" - - # /usr/sbin/burp_ca is hardcoded in conf files - sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \ - -i ${DESTDIR}/etc/burp/burp-server.conf -} - -burp-client_package() { - short_desc="${_desc} - client" - # openssl binary needed by burp_ca script - depends="ca-certificates" - conf_files="/etc/burp/burp.conf" - make_dirs="/etc/burp/CA-client 0755 root root" - pkg_install() { - vmove "usr/bin/burp" - vmove "usr/bin/burp_ca" - vmove "usr/share/man/man8/burp.8.gz" - vmove "usr/share/man/man8/burp_ca.8.gz" - vmove "etc/burp/CA-client" - vmove "etc/burp/burp.conf" - vdoc "README" - vlicense "LICENSE" - - # /usr/sbin/burp_ca is hardcoded in conf files - sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \ - -i ${PKGDESTDIR}/etc/burp/burp.conf - } -} diff --git a/srcpkgs/burp-server/update b/srcpkgs/burp-server/update deleted file mode 100644 index 76424b2f623..00000000000 --- a/srcpkgs/burp-server/update +++ /dev/null @@ -1,2 +0,0 @@ -# ignore v2 version for the moment, not yet stable -ignore="2.*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 14bd76761ff..1c869a6950f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -18,6 +18,8 @@ replaces=" avogadro<=1.2.0_8 avogadro-devel<=1.2.0_8 bokken<=1.8_3 + burp-server<=1.4.40_13 + burp-client<=1.4.40_13 bzr<=2.7.0_1 bzrtools<=2.6.0_4 caja-gksu<=1.20.2_2