Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/.SRCINFO b/.SRCINFO
- index fa89f7b..70dc21b 100644
- --- a/.SRCINFO
- +++ b/.SRCINFO
- @@ -1,23 +1,25 @@
- pkgbase = n2n-git
- - pkgdesc = Peer-to-Peer VPN.
- - pkgver = 2.5.1.r198
- + pkgdesc = A Peer-to-peer VPN software which makes it easy to create virtual networks bypassing intermediate firewalls
- + pkgver = 3.1.1.r220.gf791531
- pkgrel = 1
- url = https://github.com/ntop/n2n
- - install = n2n.install
- arch = i686
- arch = x86_64
- arch = armv7h
- arch = aarch64
- license = GPL3
- makedepends = git
- + makedepends = libpcap
- + depends = libcap
- depends = openssl
- - depends = net-tools
- + depends = miniupnpc
- + depends = zstd
- + optdepends = libpcap: for n2n-decode
- provides = n2n
- conflicts = n2n
- + backup = etc/n2n/edge.conf
- + backup = etc/n2n/supernode.conf
- source = git+https://github.com/ntop/n2n.git
- - source = n2n.install
- md5sums = SKIP
- - md5sums = 4f4c2659da00c0a7c6f5ceb42fc82a71
- pkgname = n2n-git
- -
- diff --git a/PKGBUILD b/PKGBUILD
- index cc4982b..e944f64 100644
- --- a/PKGBUILD
- +++ b/PKGBUILD
- @@ -1,55 +1,53 @@
- # Maintainer: Emanuele Faranda <black.silver@hotmail.it>
- # Contributor: maz-1 <ohmygod19993 at gmail dot com>
- +# Arch Maintainer: Felix Yan <felixonmars@archlinux.org>
- +
- pkgname=n2n-git
- _pkgname=n2n
- -pkgver=2.5.1.r198
- +pkgver=3.1.1.r220.gf791531
- pkgrel=1
- -pkgdesc="Peer-to-Peer VPN."
- +pkgdesc="A Peer-to-peer VPN software which makes it easy to create virtual networks bypassing intermediate firewalls"
- arch=(i686 x86_64 armv7h aarch64)
- url="https://github.com/ntop/n2n"
- license=('GPL3')
- -depends=('openssl' 'net-tools')
- -makedepends=('git')
- +depends=('libcap' 'openssl' 'miniupnpc' 'zstd')
- +optdepends=('libpcap: for n2n-decode')
- +makedepends=('git' 'libpcap')
- provides=(n2n)
- conflicts=(n2n)
- -install="n2n.install"
- -source=('git+https://github.com/ntop/n2n.git' 'n2n.install')
- -md5sums=('SKIP' '4f4c2659da00c0a7c6f5ceb42fc82a71')
- +backup=('etc/n2n/edge.conf'
- + 'etc/n2n/supernode.conf')
- +source=('git+https://github.com/ntop/n2n.git')
- +md5sums=('SKIP')
- pkgver() {
- - cd "$srcdir/$_pkgname"
- + cd "${_pkgname}"
- + git describe --long --abbrev=7 | sed 's/\([^-]*-g\)/r/;s/-/./g'
- +}
- - local n2n_major=`grep -F "N2N_MAJOR=" autogen.sh | sed -rs 's/^[^=]*="([^"]+)"$//'`
- - local n2n_minor=`grep -F "N2N_MINOR=" autogen.sh | sed -rs 's/^[^=]*="([^"]+)"$//'`
- - local n2n_patch=`grep -F "N2N_PATCH=" autogen.sh | sed -rs 's/^[^=]*="([^"]+)"$//'`
- - local rel="$n2n_major.$n2n_minor.$n2n_patch"
- - local rev=`git rev-list --count HEAD`
- - printf "%s.r%s" "$rel" "$rev"
- +prepare() {
- + cd "${_pkgname}"
- + sed -i 's|/sbin|/bin|' Makefile
- + sed -i 's|/usr/sbin|/usr/bin|' packages/etc/systemd/system/*.service.in
- +
- + # We need a better way to make the conf file owned by the user created in sysusers.d...
- + sed -i '/User=n2n/d;/Group=n2n/d' packages/etc/systemd/system/supernode.service.in
- }
- build() {
- - cd "$srcdir/$_pkgname"
- + cd "${_pkgname}"
- ./autogen.sh
- - ./configure --prefix=/usr
- -
- + ./configure --with-zstd --with-openssl --enable-miniupnp --enable-pcap --enable-cap --enable-pthread
- make
- -
- - # Prepare the service files
- - cd packages/debian
- - ./configure
- }
- package() {
- - cd "$srcdir/$_pkgname"
- - install -dm700 "$pkgdir/etc/n2n"
- - install -dm755 "$pkgdir/usr/lib/systemd/system"
- -
- - install -Dm600 "packages/etc/n2n/edge.conf.sample" "$pkgdir/etc/n2n/edge.conf"
- - install -Dm600 "packages/etc/n2n/supernode.conf.sample" "$pkgdir/etc/n2n/supernode.conf"
- - install -Dm644 "packages/etc/systemd/system/edge.service" "$pkgdir/usr/lib/systemd/system/edge.service"
- - install -Dm644 "packages/etc/systemd/system/edge@.service" "$pkgdir/usr/lib/systemd/system/edge@.service"
- - install -Dm644 "packages/etc/systemd/system/supernode.service" "$pkgdir/usr/lib/systemd/system/supernode.service"
- -
- - make DESTDIR="$pkgdir" install
- - mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin"
- + cd "${_pkgname}"
- + DESTDIR="$pkgdir" SBINDIR="$pkgdir"/usr/bin make install
- +
- + install -Dm600 packages/etc/n2n/edge.conf.sample "$pkgdir"/etc/n2n/edge.conf
- + install -Dm600 packages/etc/n2n/supernode.conf.sample "$pkgdir"/etc/n2n/supernode.conf
- + install -Dm644 packages/etc/systemd/system/edge.service.in "$pkgdir"/usr/lib/systemd/system/edge.service
- + install -Dm644 packages/etc/systemd/system/edge@.service.in "$pkgdir"/usr/lib/systemd/system/edge@.service
- + install -Dm644 packages/etc/systemd/system/supernode.service.in "$pkgdir"/usr/lib/systemd/system/supernode.service
- }
- diff --git a/n2n.install b/n2n.install
- deleted file mode 100644
- index 4575f81..0000000
- --- a/n2n.install
- +++ /dev/null
- @@ -1,9 +0,0 @@
- -post_install() {
- - post_upgrade
- -}
- -
- -post_upgrade() {
- - # the n2n user will be used by the supernode and edge services
- - getent group n2n >/dev/null || groupadd -r n2n
- - getent passwd n2n >/dev/null || useradd -M -N -d / -g n2n -r -s /sbin/nologin n2n
- -}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement