diff options
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 38 | ||||
| -rw-r--r-- | douane-dkms-git.install | 15 |
4 files changed, 23 insertions, 49 deletions
@@ -1,19 +1,16 @@ -# Generated by mksrcinfo v8 -# Wed Dec 16 18:48:54 UTC 2015 pkgbase = douane-dkms-git pkgdesc = Douane Firewall Kernel Module (DKMS) - pkgver = 1 - pkgrel = 2 + pkgver = 0.8.2+5.gdf94296dea10b3a5ce3e + pkgrel = 1 url = http://douaneapp.com/ - install = douane-dkms-git.install - arch = i686 arch = x86_64 license = GPL2 makedepends = git depends = dkms - source = git+https://github.com/Douane/douane-dkms.git - source = douane-dkms-git.install + provides = douane-dkms=0.8.2 + conflicts = douane-dkms + source = https://gitlab.com/douaneapp/douane-dkms.git md5sums = SKIP - md5sums = 3754DB1C07F0F21AB3A3A167138DD791 pkgname = douane-dkms-git + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..018a3de08144 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +* +!PKGBUILD +!.SRCINFO +!.gitignore @@ -1,37 +1,25 @@ pkgname=douane-dkms-git -pkgver=1 -pkgrel=2 +pkgver=0.8.2+5.gdf94296dea10b3a5ce3e +pkgrel=1 pkgdesc="Douane Firewall Kernel Module (DKMS)" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://douaneapp.com/" license=('GPL2') depends=('dkms') makedepends=('git') -install=${pkgname}.install -source=('git+https://github.com/Douane/douane-dkms.git' - "${pkgname}.install") -md5sums=('SKIP' - '3754DB1C07F0F21AB3A3A167138DD791') +source=('git+https://gitlab.com/douaneapp/douane-dkms.git') +md5sums=('SKIP') +conflicts=(douane-dkms) +provides=(douane-dkms=${pkgver%+*}) pkgver() { - cd "$srcdir/douane-dkms" - # Use the tag of the last commit - git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g' + git -C douane-dkms describe --always | sed 's/^v//; s/-/+/; s/-/./' } - package() { - # Install - cd "$srcdir/douane-dkms" - # Copy dkms.conf - install -Dm644 dkms.conf "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf - - # Set name and versionz - sed -e "s/@_PKGBASE@/${_pkgbase}/" \ - -e "s/@PKGVER@/${pkgver}/" \ - -i "${pkgdir}"/usr/src/${pkgname}-${pkgver}/dkms.conf - - for i in "${srcdir}/douane-dkms/"{Makefile,douane.c,network_activity_message.h}; do - install -D -m644 "${i}" "${pkgdir}/usr/src/${pkgname}-${pkgver}/" - done + install -Dm644 -t "$pkgdir/usr/src/$pkgname-$pkgver/" \ + douane-dkms/dkms.conf \ + douane-dkms/Makefile \ + douane-dkms/*.c \ + douane-dkms/*.h } diff --git a/douane-dkms-git.install b/douane-dkms-git.install deleted file mode 100644 index efdeb0e2126b..000000000000 --- a/douane-dkms-git.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - dkms install -m douane -v ${1%%-*} -} -pre_upgrade() { - local curver=${2%%-*} - # $2 is unset due to a bug. Query current version using pacman as fallback - [ -n "$curver" ] || curver=$(pacman -Qi douane-dkms | awk '/^Version/{print $3}') - pre_remove $curver -} -post_upgrade() { - post_install ${1%%-*} -} -pre_remove() { - dkms remove -m douane -v ${1%%-*} --all -} |