Felix Yan pushed to branch main at Arch Linux / Packaging / Packages / tuntox
Commits:
6026e1ee by loqs at 2023-12-21T15:05:30+00:00
Switched to signed git tag.
There is no signature file for the 0.0.10.1 tarball. git was previously used
between c35f17bb82349a8f1ea22f89fdfab2588f08521c and
7a53931bc77dc7bb6c0bc39da88b51a2609ca53d.
- - - - -
8a7b06c3 by loqs at 2023-12-21T15:34:27+00:00
Drop unneeded depends libevent.
- - - - -
a896cff5 by loqs at 2023-12-21T15:34:51+00:00
Drop unneeded makedepends cscope.
- - - - -
7548c70d by loqs at 2023-12-21T15:35:01+00:00
Change sed substitutions.
Use single quoting to avoid shell variable expansion in the sed substitutions.
Amend comment to reflect that DSO_LDFLAGS will be set to LDFLAGS from makepkg.
This produces the following change in the modified Makefile:
```
< DSO_LDFLAGS=-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now-g -pthread
-lm -lrt
---
> DSO_LDFLAGS=$(LDFLAGS)
```
- - - - -
1 changed file:
- PKGBUILD
Changes:
=====================================
PKGBUILD
=====================================
@@ -3,37 +3,36 @@
pkgname=tuntox
pkgver=0.0.10.1
+_tag=cedf90d610a87d115bcd3d0d9c08fd38c28bb174 # git rev-parse $pkgver
pkgrel=1
pkgdesc='Tunnel TCP connections over the Tox protocol'
arch=('x86_64')
url='https://github.com/gjedeer/tuntox'
license=('GPL3')
-depends=('toxcore' 'libevent')
-makedepends=('cscope' 'git')
-source=("https://github.com/gjedeer/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz";
-
#"https://github.com/gjedeer/${pkgname}/releases/download/${pkgver}/${pkgver}.tar.gz.asc";
- )
-sha512sums=('6f5a01df207df62c3c3371418702ab96ba5b9a9ea8cb4499aaf96bf68f88861f6b5b73769366949de21e9c4a330ce1f02bd4fd222ef24b608a49a71a6e542861')
+depends=('toxcore')
+makedepends=('git')
+source=("git+https://github.com/gjedeer/tuntox#tag=$_tag?signed";)
+sha512sums=('SKIP')
validpgpkeys=('11C1B15A5D5DD662E469928AEBDA6B974ED3D2B7') # GDR!_
<[email protected]>
prepare() {
- cd $pkgname-$pkgver
+ cd $pkgname
#sed -i "s|DEPS=libsodium toxcore|DEPS=libsodium libtoxcore|" Makefile
- sed -i "/^CFLAGS=/d" Makefile # use CFLAGS from makepkg
- sed -i "/^LDFLAGS=/d" Makefile # use LDFLAGS from makepkg
- sed -i "s/^DSO_LDFLAGS=/DSO_LDFLAGS=$LDFLAGS/" Makefile # use DSO_LDFLAGS
from makepkg
+ sed -i '/^CFLAGS=/d' Makefile # use CFLAGS from makepkg
+ sed -i '/^LDFLAGS=/d' Makefile # use LDFLAGS from makepkg
+ sed -i 's/^DSO_LDFLAGS=.*$/DSO_LDFLAGS=$(LDFLAGS)/' Makefile # use LDFLAGS
from makepkg
cat Makefile
}
build() {
- cd $pkgname-$pkgver
+ cd $pkgname
make tuntox_nostatic # use dynamic linking
mv tuntox_nostatic tuntox
}
package() {
- cd $pkgname-$pkgver
+ cd $pkgname
install -Dm755 tuntox "$pkgdir/usr/bin/tuntox"
install -Dm755 scripts/tokssh "$pkgdir/usr/bin/tokssh"
install -Dm644 scripts/tuntox.service
"$pkgdir/usr/lib/systemd/system/tuntox.service"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/tuntox/-/compare/626a25572d93448d3e36c8a4c7aaf76cc548e0db...7548c70de3206f605edcf4f90ad1d21c64ac85e4
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/tuntox/-/compare/626a25572d93448d3e36c8a4c7aaf76cc548e0db...7548c70de3206f605edcf4f90ad1d21c64ac85e4
You're receiving this email because of your account on gitlab.archlinux.org.
