tripwire: update PKGBUILD

New upstream
some adjustments in regards of guidelines
Download protocol from git:// to git+https://

Source doesn't compile

2 files changed, 40 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c75d31374d48..7273b7b75923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = tripwire-git
-	pkgdesc = An intrusion detection system
-	pkgver = r74.acf7bd3
+	pkgdesc = intrusion detection system
+	pkgver = r373.4c84a88
 	pkgrel = 1
-	url = http://sourceforge.net/projects/tripwire/
+	url = https://github.com/Tripwire/tripwire-open-source
 	install = tripwire-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = automake
-	depends = openssl
+	depends = openssl-1.1
 	optdepends = lynis
 	provides = tripwire
+	conflicts = tripwire
 	backup = etc/tripwire/twpol.txt
 	backup = etc/tripwire/twcfg.txt
-	source = tripwire-open-source::git://github.com/Tripwire/tripwire-open-source.git#branch=master
+	source = tripwire-open-source::git+https://github.com/Tripwire/tripwire-open-source.git#branch=master
 	source = twpol.txt
 	source = twcfg.txt
 	sha256sums = SKIP
@@ -22,4 +23,3 @@ pkgbase = tripwire-git
 	sha256sums = 3aaa567f7a0a4efce3ac127344a9b795c5494c9d011e27a7d454d632ba3d533d
 
 pkgname = tripwire-git
-
diff --git a/PKGBUILD b/PKGBUILD
index a0d83845aebf..4f92532f1af6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,74 +2,81 @@
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
 # Contributor: eliott <eliott@cactuswax.net>
 
+_name=tripwire-open-source
 pkgname=tripwire-git
-pkgver=r74.acf7bd3
+pkgver=r373.4c84a88
 pkgrel=1
-pkgdesc="An intrusion detection system"
+pkgdesc="intrusion detection system"
 arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/tripwire/"
+url="https://github.com/Tripwire/tripwire-open-source"
 license=('GPL')
-depends=('openssl')
+depends=('openssl-1.1')
 optdepends=('lynis')
 makedepends=('git' 'automake')
 provides=('tripwire')
-#replaces=('tripwire')
+conflicts=('tripwire')
 backup=('etc/tripwire/twpol.txt' 'etc/tripwire/twcfg.txt')
 install=$pkgname.install
-#options=('!makeflags')
-source=('tripwire-open-source::git://github.com/Tripwire/tripwire-open-source.git#branch=master' twpol.txt twcfg.txt)
+source=($_name::git+https://github.com/Tripwire/tripwire-open-source.git#branch=master
+        twpol.txt
+        twcfg.txt)
 sha256sums=('SKIP'
             '4da49a185fee570e0a7bdc7acaadc0d2bf7f4c488057e93e60b2a2819807cd9d'
             '3aaa567f7a0a4efce3ac127344a9b795c5494c9d011e27a7d454d632ba3d533d')
 
-build() {
-  cd ${srcdir}/tripwire-open-source
-
-#build package
-#  CFLAGS="$CFLAGS -fno-strict-aliasing" CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" \
-    autoreconf --force --install
-    ${srcdir}/tripwire-open-source/autogen.sh
-    ./configure --sysconfdir=/etc/tripwire
-  make -j4
-}
 
 pkgver() {
- cd ${srcdir}/tripwire-open-source
+ cd ${_name}
   ( set -o pipefail
     git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
   )
 }
+
+prepare() {
+  cd ${_name}
+
+  # adjust paths
+  sed -i 's#./install/install.cfg#./install.cfg#' installer/install.sh
+
+  # autotools stuff
+  autoreconf --force --install
+  ./autogen.sh
+  ./configure --sysconfdir=/etc/tripwire
+}
+build() {
+  cd ${_name}
+  make -j4
+}
+
 package () {
-  cd ${srcdir}/tripwire-open-source
+  cd ${_name}
 
   # This package doesn't have a typical make install, so we do it by hand.
- 
-#create var/lib directories
+  #create var/lib directories
   install -d ${pkgdir}/var/lib
   install -d -m700 ${pkgdir}/var/lib/tripwire
   install -d -m700 ${pkgdir}/var/lib/tripwire/report
 
-#install binaries
+  #install binaries
   install -d ${pkgdir}/usr/bin
   install -m755 bin/siggen ${pkgdir}/usr/bin/
   install -m755 bin/tripwire ${pkgdir}/usr/bin/
   install -m755 bin/twadmin ${pkgdir}/usr/bin/
   install -m755 bin/twprint ${pkgdir}/usr/bin/
 
-#copy install files for use by user after install, and fix a path
+  #copy install files for use by user after install, and fix a path
   install -d ${pkgdir}/usr/share/$pkgname
   install -m755 installer/install.sh ${pkgdir}/usr/share/$pkgname/
   install -m644 installer/install.cfg ${pkgdir}/usr/share/$pkgname/
-  sed -i 's#./install/install.cfg#./install.cfg#' ${pkgdir}/usr/share/$pkgname/install.sh
-
-#install man pages - FS#13766 fixed
+  
+  #install man pages - FS#13766 fixed
   install -d ${pkgdir}/usr/share/man/{man4,man5,man8}
   install -m644 man/man4/*.4 ${pkgdir}/usr/share/man/man4/
   install -m644 man/man5/*.5 ${pkgdir}/usr/share/man/man5/
   install -m644 man/man8/*.8 ${pkgdir}/usr/share/man/man8/
 
-#install configuration files
+  #install configuration files
   mkdir ${pkgdir}/etc
   mkdir ${pkgdir}/etc/tripwire
   install -d ${pkgdir}/etc/$pkgname