diff options
| -rw-r--r-- | .gitattributes | 2 | ||||
| -rw-r--r-- | Makefile | 33 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | contrib/PKGBUILD | 4 | ||||
| -rw-r--r-- | docs/.gitignore | 1 |
5 files changed, 27 insertions, 20 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5966153 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +.gitattributes export-ignore +.gitignore export-ignore @@ -60,25 +60,26 @@ install-docs: docs docs: $(MAKE) -C $@ -tarball: netcfg-$(VERSION).tar.gz -netcfg-$(VERSION).tar.gz: - -rm -rf netcfg-$(VERSION) - mkdir -p netcfg-$(VERSION) - cp -r docs config rc.d src scripts src-wireless systemd contrib Makefile LICENSE README netcfg-$(VERSION) - sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/" netcfg-$(VERSION)/scripts/netcfg - tar -zcvf netcfg-$(VERSION).tar.gz netcfg-$(VERSION) - rm -rf netcfg-$(VERSION) +tarball: netcfg-$(VERSION).tar.xz +netcfg-$(VERSION).tar.xz: | docs + cp scripts/netcfg{,.orig} + sed -i "s/NETCFG_VER=.*/NETCFG_VER=$(VERSION)/" scripts/netcfg + git stash save -q + git archive -o netcfg-$(VERSION).tar --prefix=netcfg-$(VERSION)/ stash + git stash pop -q + mv scripts/netcfg{.orig,} + tar --exclude-vcs --transform "s%^%netcfg-$(VERSION)/%" -uf netcfg-$(VERSION).tar docs/ + xz netcfg-$(VERSION).tar -pkgbuild: netcfg-$(VERSION).tar.gz - sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum netcfg-$(VERSION).tar.gz | cut -d ' ' -f 1)/" contrib/PKGBUILD > PKGBUILD +pkgbuild: PKGBUILD +PKGBUILD: netcfg-$(VERSION).tar.xz + sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum netcfg-$(VERSION).tar.xz | cut -d ' ' -f 1)/" contrib/PKGBUILD > PKGBUILD -upload: netcfg-$(VERSION).tar.gz - md5sum netcfg-$(VERSION).tar.gz > MD5SUMS.$(VERSION) - scp netcfg-$(VERSION).tar.gz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/ +upload: netcfg-$(VERSION).tar.xz + md5sum netcfg-$(VERSION).tar.xz > MD5SUMS.$(VERSION) + scp netcfg-$(VERSION).tar.xz MD5SUMS.$(VERSION) archlinux.org:/srv/ftp/other/netcfg/ clean: $(MAKE) -C docs clean - -@rm -vrf netcfg-$(VERSION) 2>/dev/null - -@rm -vrf pkg 2>/dev/null - -@rm -vf PKGBUILD *.gz MD5SUMS.* 2>/dev/null + -@rm -vf PKGBUILD *.xz MD5SUMS.* 2>/dev/null @@ -5,8 +5,11 @@ version 2.7 - add support for PPPoE connections - add support for profile backgrounding in net-profiles (FS#23934) - add interactive wifi connection tool wifi-menu -- add netcfg option to reconnect an interface -- assorted fixes +- add netcfg option to reconnect an interface (-R) (FS#28196) +- rename the option to disconnect an interface (was: -i, now: -D) +- stop suggesting profile-scripting through /etc/network.d/hooks as it was + unused and the {PRE,POST}_{UP,DOWN} variables work just fine (FS#27496) +- assorted fixes (FS#24599, FS#26370, FS#26607, FS#28022) version 2.6.8 - fix broken 802.11 in non-wireless setups (FS#25473) diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD index ae06f12..bdeec17 100644 --- a/contrib/PKGBUILD +++ b/contrib/PKGBUILD @@ -8,7 +8,7 @@ url="http://archlinux.org" license=("BSD") backup=(etc/iftab etc/conf.d/netcfg) depends=("coreutils" "dhcpcd>=4.0" "iproute2") -makedepends=('asciidoc') +#makedepends=('asciidoc') # The source tarball includes pre-built documentation. optdepends=('dialog: Required for menu based profile and wifi selectors' 'bridge-utils: To set up bridge connections' 'wpa_supplicant: required for wireless network support' @@ -16,7 +16,7 @@ optdepends=('dialog: Required for menu based profile and wifi selectors' 'ifplugd: Required for automatic wired connection with rc.d/net-auto-wired' 'wireless_tools: Required for net-rename' ) -source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/netcfg/netcfg-${pkgver}.tar.xz) arch=(any) md5sums=('%md5sum%') diff --git a/docs/.gitignore b/docs/.gitignore index 3e5dd9b..1f7c5c7 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -1,3 +1,4 @@ *.1 *.5 *.8 +*.html |