From 24a7ccb0562a867e363a10ebdc64e3aaa6f01cd2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 7 Jun 2016 11:42:32 +0200 Subject: treewide: replace jow@openwrt.org with jo@mein.io Signed-off-by: Jo-Philipp Wich --- package/kernel/broadcom-wl/src/glue/Makefile | 2 +- package/kernel/broadcom-wl/src/glue/wl_glue.c | 4 ++-- package/kernel/broadcom-wl/src/glue/wl_glue.h | 2 +- package/libs/gettext/Makefile | 2 +- package/libs/libevent2/Makefile | 2 +- package/libs/libiconv-full/Makefile | 2 +- package/libs/libiconv/Makefile | 2 +- package/libs/libmnl/Makefile | 2 +- package/libs/libnetfilter-conntrack/Makefile | 2 +- package/libs/libnfnetlink/Makefile | 2 +- package/libs/sysfsutils/Makefile | 2 +- package/network/ipv6/thc-ipv6/Makefile | 2 +- package/network/services/ipset-dns/Makefile | 2 +- package/network/services/lldpd/Makefile | 2 +- .../network/services/ppp/patches/010-use_target_for_configure.patch | 2 +- package/network/services/ppp/patches/100-debian_ip-ip_option.patch | 2 +- package/network/services/ppp/patches/101-debian_close_dev_ppp.patch | 2 +- .../network/services/ppp/patches/103-debian_fix_link_pidfile.patch | 2 +- package/network/services/ppp/patches/106-debian_stripMSdomain.patch | 2 +- .../network/services/ppp/patches/107-debian_pppoatm_wildcard.patch | 2 +- package/network/services/ppp/patches/110-debian_defaultroute.patch | 2 +- .../network/services/ppp/patches/120-debian_ipv6_updown_option.patch | 2 +- package/network/services/ppp/patches/200-makefile.patch | 2 +- package/network/services/ppp/patches/201-mppe_mppc_1.1.patch | 2 +- package/network/services/ppp/patches/202-no_strip.patch | 2 +- package/network/services/ppp/patches/203-opt_flags.patch | 2 +- package/network/services/ppp/patches/205-no_exponential_timeout.patch | 2 +- package/network/services/ppp/patches/206-compensate_time_change.patch | 2 +- package/network/services/ppp/patches/207-lcp_mtu_max.patch | 2 +- package/network/services/ppp/patches/208-fix_status_code.patch | 2 +- .../network/services/ppp/patches/300-filter-pcap-includes-lib.patch | 2 +- package/network/services/ppp/patches/310-precompile_filter.patch | 2 +- package/network/services/ppp/patches/320-custom_iface_names.patch | 2 +- .../services/ppp/patches/330-retain_foreign_default_routes.patch | 2 +- .../network/services/ppp/patches/340-populate_default_gateway.patch | 2 +- package/network/services/ppp/patches/400-simplify_kernel_checks.patch | 2 +- package/network/services/ppp/patches/401-no_record_file.patch | 2 +- package/network/services/ppp/patches/403-no_wtmp.patch | 2 +- .../services/ppp/patches/404-remove_obsolete_protocol_names.patch | 2 +- package/network/services/ppp/patches/405-no_multilink_option.patch | 2 +- package/network/services/uhttpd/Makefile | 2 +- package/network/utils/conntrack-tools/Makefile | 2 +- package/network/utils/dante/Makefile | 2 +- package/network/utils/iftop/Makefile | 2 +- package/network/utils/ipset/Makefile | 2 +- package/network/utils/iputils/Makefile | 2 +- package/network/utils/iwcap/Makefile | 4 ++-- package/network/utils/iwcap/src/iwcap.c | 2 +- package/network/utils/iwinfo/Makefile | 4 ++-- package/network/utils/owipcalc/Makefile | 4 ++-- package/network/utils/owipcalc/src/owipcalc.c | 2 +- package/network/utils/resolveip/Makefile | 2 +- package/network/utils/resolveip/src/resolveip.c | 2 +- package/network/utils/xtables-addons/Makefile | 2 +- package/system/opkg/Makefile | 2 +- package/system/rpcd/Makefile | 2 +- package/utils/jsonfilter/Makefile | 2 +- package/utils/lua/Makefile | 2 +- package/utils/px5g/Makefile | 4 ++-- scripts/bundle-libraries.sh | 2 +- scripts/ext-toolchain.sh | 2 +- scripts/srecimage.pl | 2 +- target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch | 4 ++-- target/linux/generic/patches-4.1/615-netfilter_add_xt_id_match.patch | 4 ++-- target/linux/generic/patches-4.4/615-netfilter_add_xt_id_match.patch | 4 ++-- 65 files changed, 73 insertions(+), 73 deletions(-) diff --git a/package/kernel/broadcom-wl/src/glue/Makefile b/package/kernel/broadcom-wl/src/glue/Makefile index 81f0c8a..f434d24 100644 --- a/package/kernel/broadcom-wl/src/glue/Makefile +++ b/package/kernel/broadcom-wl/src/glue/Makefile @@ -1,7 +1,7 @@ # # Makefile for wl_glue driver # -# Copyright (C) 2011 Jo-Philipp Wich +# Copyright (C) 2011 Jo-Philipp Wich # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/package/kernel/broadcom-wl/src/glue/wl_glue.c b/package/kernel/broadcom-wl/src/glue/wl_glue.c index 64f8486..7851f41 100644 --- a/package/kernel/broadcom-wl/src/glue/wl_glue.c +++ b/package/kernel/broadcom-wl/src/glue/wl_glue.c @@ -1,6 +1,6 @@ /* * wl_glue.c: Broadcom WL support module providing a unified SSB/BCMA handling. - * Copyright (C) 2011 Jo-Philipp Wich + * Copyright (C) 2011 Jo-Philipp Wich */ #include "wl_glue.h" @@ -21,7 +21,7 @@ #include #endif -MODULE_AUTHOR("Jo-Philipp Wich (jow@openwrt.org)"); +MODULE_AUTHOR("Jo-Philipp Wich (jo@mein.io)"); MODULE_DESCRIPTION("Broadcom WL SSB/BCMA compatibility layer"); MODULE_LICENSE("GPL"); diff --git a/package/kernel/broadcom-wl/src/glue/wl_glue.h b/package/kernel/broadcom-wl/src/glue/wl_glue.h index b3c8aa3..49610ab 100644 --- a/package/kernel/broadcom-wl/src/glue/wl_glue.h +++ b/package/kernel/broadcom-wl/src/glue/wl_glue.h @@ -1,6 +1,6 @@ /* * wl_glue.h: Broadcom WL support module providing a unified SSB/BCMA handling. - * Copyright (C) 2011 Jo-Philipp Wich + * Copyright (C) 2011 Jo-Philipp Wich */ #include diff --git a/package/libs/gettext/Makefile b/package/libs/gettext/Makefile index 093be1d..cb4ee12 100644 --- a/package/libs/gettext/Makefile +++ b/package/libs/gettext/Makefile @@ -13,7 +13,7 @@ PKG_RELEASE:=2 PKG_LICENSE:=FSFULLR PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk diff --git a/package/libs/libevent2/Makefile b/package/libs/libevent2/Makefile index 6835007..375bc8c 100644 --- a/package/libs/libevent2/Makefile +++ b/package/libs/libevent2/Makefile @@ -15,7 +15,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz PKG_SOURCE_URL:=@SF/levent PKG_MD5SUM:=c4c56f986aa985677ca1db89630a2e11 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=BSD-3-Clause PKG_FIXUP:=autoreconf diff --git a/package/libs/libiconv-full/Makefile b/package/libs/libiconv-full/Makefile index d23af57..4327321 100644 --- a/package/libs/libiconv-full/Makefile +++ b/package/libs/libiconv-full/Makefile @@ -11,7 +11,7 @@ PKG_NAME:=libiconv-full PKG_VERSION:=1.11.1 PKG_RELEASE:=3 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_SOURCE:=libiconv-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libiconv diff --git a/package/libs/libiconv/Makefile b/package/libs/libiconv/Makefile index 9716261..61e4b3b 100644 --- a/package/libs/libiconv/Makefile +++ b/package/libs/libiconv/Makefile @@ -16,7 +16,7 @@ PKG_RELEASE:=8 PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk diff --git a/package/libs/libmnl/Makefile b/package/libs/libmnl/Makefile index 06c7765..a782751 100644 --- a/package/libs/libmnl/Makefile +++ b/package/libs/libmnl/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \ ftp://ftp.netfilter.org/pub/libmnl PKG_MD5SUM:=7d95fc3bea3365bc03c48e484224f65f -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile index e60b59a..072fa40 100644 --- a/package/libs/libnetfilter-conntrack/Makefile +++ b/package/libs/libnetfilter-conntrack/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/libnetfilter_conntrack/files/ \ ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/ PKG_MD5SUM:=18cf80c4b339a3285e78822dbd4f08d7 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_FIXUP:=autoreconf PKG_LICENSE:=GPL-2.0+ diff --git a/package/libs/libnfnetlink/Makefile b/package/libs/libnfnetlink/Makefile index 861c604..6f4974f 100644 --- a/package/libs/libnfnetlink/Makefile +++ b/package/libs/libnfnetlink/Makefile @@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \ ftp://ftp.netfilter.org/pub/libnfnetlink/ \ http://mirrors.evolva.ro/netfilter.org/libnfnetlink/ PKG_MD5SUM:=98927583d2016a9fb1936fed992e2c5e -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0+ PKG_FIXUP:=autoreconf diff --git a/package/libs/sysfsutils/Makefile b/package/libs/sysfsutils/Makefile index 9ee76a0..67b4386 100644 --- a/package/libs/sysfsutils/Makefile +++ b/package/libs/sysfsutils/Makefile @@ -14,7 +14,7 @@ PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/linux-diag PKG_MD5SUM:=14e7dcd0436d2f49aa403f67e1ef7ddc -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:=COPYING cmd/GPL lib/LGPL diff --git a/package/network/ipv6/thc-ipv6/Makefile b/package/network/ipv6/thc-ipv6/Makefile index fdfc1f2..563afa4 100644 --- a/package/network/ipv6/thc-ipv6/Makefile +++ b/package/network/ipv6/thc-ipv6/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://freeworld.thc.org/releases/ PKG_MD5SUM:=2975dd54be35b68c140eb2a6b8ef5e59 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich include $(INCLUDE_DIR)/package.mk diff --git a/package/network/services/ipset-dns/Makefile b/package/network/services/ipset-dns/Makefile index 37cf7c5..1fa87ce 100644 --- a/package/network/services/ipset-dns/Makefile +++ b/package/network/services/ipset-dns/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://git.zx2c4.com/ipset-dns PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=6be3afd819a86136b51c5ae722ab48266187155b PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/lldpd/Makefile b/package/network/services/lldpd/Makefile index 15f8268..4bc371f 100644 --- a/package/network/services/lldpd/Makefile +++ b/package/network/services/lldpd/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://media.luffy.cx/files/lldpd PKG_MD5SUM:=ed0226129b0c90b3a45c273fe1aba8de -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC PKG_FIXUP:=autoreconf diff --git a/package/network/services/ppp/patches/010-use_target_for_configure.patch b/package/network/services/ppp/patches/010-use_target_for_configure.patch index aff0df6..7deac0e 100644 --- a/package/network/services/ppp/patches/010-use_target_for_configure.patch +++ b/package/network/services/ppp/patches/010-use_target_for_configure.patch @@ -5,7 +5,7 @@ reported by the build host system. This patch allows overriding the "uname -r", "uname -s" and "uname -m" results with the "UNAME_R", "UNAME_S" and "UNAME_M" environment variables. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/configure +++ b/configure diff --git a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch index 1017e0f..703311f 100644 --- a/package/network/services/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/network/services/ppp/patches/100-debian_ip-ip_option.patch @@ -8,7 +8,7 @@ existing behaviour. The patch originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/ipcp.c +++ b/pppd/ipcp.c diff --git a/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch b/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch index 7c6765b..629c232 100644 --- a/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch +++ b/package/network/services/ppp/patches/101-debian_close_dev_ppp.patch @@ -8,7 +8,7 @@ descriptors are always reported as ready by select(). This patch closes the descriptor if it is already open when establishing a new connection. It originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c diff --git a/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch b/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch index c8a23ed..d5d5851 100644 --- a/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch +++ b/package/network/services/ppp/patches/103-debian_fix_link_pidfile.patch @@ -7,7 +7,7 @@ linkpidfile[0] but this is only filled in when create_linkpidfile() is called. This patch changes to code to allways uncondiationally call create_linkpidfile(), it originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/106-debian_stripMSdomain.patch b/package/network/services/ppp/patches/106-debian_stripMSdomain.patch index 86af1ef..376de64 100644 --- a/package/network/services/ppp/patches/106-debian_stripMSdomain.patch +++ b/package/network/services/ppp/patches/106-debian_stripMSdomain.patch @@ -9,7 +9,7 @@ backslash in the username are stripped. The option defaults to false. The patch originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/chap-new.c +++ b/pppd/chap-new.c diff --git a/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch b/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch index eaad2cd..6f559a1 100644 --- a/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch +++ b/package/network/services/ppp/patches/107-debian_pppoatm_wildcard.patch @@ -10,7 +10,7 @@ enough flexibility to cope with changing device names. The patch originated from the Debain project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/plugins/pppoatm/pppoatm.c +++ b/pppd/plugins/pppoatm/pppoatm.c diff --git a/package/network/services/ppp/patches/110-debian_defaultroute.patch b/package/network/services/ppp/patches/110-debian_defaultroute.patch index e8659ea..1005c59 100644 --- a/package/network/services/ppp/patches/110-debian_defaultroute.patch +++ b/package/network/services/ppp/patches/110-debian_defaultroute.patch @@ -8,7 +8,7 @@ connections but not allow them to change the system default route. The patch originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/ipcp.c +++ b/pppd/ipcp.c diff --git a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch index 0e57029..a575df5 100644 --- a/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch +++ b/package/network/services/ppp/patches/120-debian_ipv6_updown_option.patch @@ -8,7 +8,7 @@ existing behaviour. The patch originated from the Debian project. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/200-makefile.patch b/package/network/services/ppp/patches/200-makefile.patch index d5e5719..1430232 100644 --- a/package/network/services/ppp/patches/200-makefile.patch +++ b/package/network/services/ppp/patches/200-makefile.patch @@ -3,7 +3,7 @@ pppd: tune Linux config defaults for OpenWrt This patch adjusts a number defaults to properly match the OpenWrt environment. It is not intended for upstream. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux diff --git a/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch b/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch index 0bc42d4..3fc30bb 100644 --- a/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch +++ b/package/network/services/ppp/patches/201-mppe_mppc_1.1.patch @@ -3,7 +3,7 @@ pppd: add support for MPPE and MPPC encryption and compression protocols This is a forward ported version of ppp-2.4.3-mppe-mppc-1.1.patch.gz found on http://mppe-mppc.alphacron.de/ . -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/include/linux/ppp-comp.h +++ b/include/linux/ppp-comp.h diff --git a/package/network/services/ppp/patches/202-no_strip.patch b/package/network/services/ppp/patches/202-no_strip.patch index 375f449..29d8f74 100644 --- a/package/network/services/ppp/patches/202-no_strip.patch +++ b/package/network/services/ppp/patches/202-no_strip.patch @@ -4,7 +4,7 @@ Strippign executables should be handled by the distro packaging, not by ppp itself. This patch removes the "-s" (strip) switch from all "install" commands in order to install unstripped binaries into the destination prefix. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/chat/Makefile.linux +++ b/chat/Makefile.linux diff --git a/package/network/services/ppp/patches/203-opt_flags.patch b/package/network/services/ppp/patches/203-opt_flags.patch index 906d081..d0eb918 100644 --- a/package/network/services/ppp/patches/203-opt_flags.patch +++ b/package/network/services/ppp/patches/203-opt_flags.patch @@ -4,7 +4,7 @@ Isolate optimization related compiler flags from CFLAGS and move them into a separate COPTS variable so that it is easier to override optimizations from the environment. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/plugins/radius/Makefile.linux +++ b/pppd/plugins/radius/Makefile.linux diff --git a/package/network/services/ppp/patches/205-no_exponential_timeout.patch b/package/network/services/ppp/patches/205-no_exponential_timeout.patch index 68aea12..1395ca5 100644 --- a/package/network/services/ppp/patches/205-no_exponential_timeout.patch +++ b/package/network/services/ppp/patches/205-no_exponential_timeout.patch @@ -3,7 +3,7 @@ pppd: Don't use exponential timeout in discovery phase This patch removes the exponential timeout increase between PADO or PADS discovery attempts. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/plugins/rp-pppoe/discovery.c +++ b/pppd/plugins/rp-pppoe/discovery.c diff --git a/package/network/services/ppp/patches/206-compensate_time_change.patch b/package/network/services/ppp/patches/206-compensate_time_change.patch index fb6c656..31a582a 100644 --- a/package/network/services/ppp/patches/206-compensate_time_change.patch +++ b/package/network/services/ppp/patches/206-compensate_time_change.patch @@ -9,7 +9,7 @@ is confused resulting in unreliable data. This patch implements periodic clock checking to look for time warps, if one is detected, the internal counters are adjusted accordingly. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/207-lcp_mtu_max.patch b/package/network/services/ppp/patches/207-lcp_mtu_max.patch index 240701b..f406f68 100644 --- a/package/network/services/ppp/patches/207-lcp_mtu_max.patch +++ b/package/network/services/ppp/patches/207-lcp_mtu_max.patch @@ -4,7 +4,7 @@ This patchs caps the calculated MTU value in lcp.c to the user specified "mru" option value. Without this patch pppd would advertise a different MTU value compared to what is set on the local interface in some cases. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/lcp.c +++ b/pppd/lcp.c diff --git a/package/network/services/ppp/patches/208-fix_status_code.patch b/package/network/services/ppp/patches/208-fix_status_code.patch index 25e2a10..eb24b0a 100644 --- a/package/network/services/ppp/patches/208-fix_status_code.patch +++ b/package/network/services/ppp/patches/208-fix_status_code.patch @@ -8,7 +8,7 @@ The motiviation of this patch is to allow applications which remote control pppd to react properly on errors, e.g. only redial (relaunch pppd) if there was a hangup, but not if the CHAP authentication failed. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch b/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch index 843c9f2..68a56aa 100644 --- a/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch +++ b/package/network/services/ppp/patches/300-filter-pcap-includes-lib.patch @@ -3,7 +3,7 @@ build: Add required CFLAGS for libpcap This patch adds some flags to required to properly link libpcap within the OpenWrt environment. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux diff --git a/package/network/services/ppp/patches/310-precompile_filter.patch b/package/network/services/ppp/patches/310-precompile_filter.patch index 877ca6b..701e49d 100644 --- a/package/network/services/ppp/patches/310-precompile_filter.patch +++ b/package/network/services/ppp/patches/310-precompile_filter.patch @@ -9,7 +9,7 @@ compiled filter file containing rules to match packets which should be passed, "precompiled-active-filter" specifies a filter file containing rules to match packets which are treated as active. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/Makefile.linux +++ b/pppd/Makefile.linux diff --git a/package/network/services/ppp/patches/320-custom_iface_names.patch b/package/network/services/ppp/patches/320-custom_iface_names.patch index ccda0c6..441f9ee 100644 --- a/package/network/services/ppp/patches/320-custom_iface_names.patch +++ b/package/network/services/ppp/patches/320-custom_iface_names.patch @@ -5,7 +5,7 @@ fully custom PPP interface names on Linux. It does so by renaming the allocated pppX device immediately after it has been created to the requested interface name. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch b/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch index f68b466..45fc4b9 100644 --- a/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch +++ b/package/network/services/ppp/patches/330-retain_foreign_default_routes.patch @@ -8,7 +8,7 @@ to another interface. This patch makes pppd fill out the rt_dev field so that only own default routes are ever matched. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c diff --git a/package/network/services/ppp/patches/340-populate_default_gateway.patch b/package/network/services/ppp/patches/340-populate_default_gateway.patch index a1451de..5a69447 100644 --- a/package/network/services/ppp/patches/340-populate_default_gateway.patch +++ b/package/network/services/ppp/patches/340-populate_default_gateway.patch @@ -9,7 +9,7 @@ the default gateway IP address from the system default route entry. This patch addresses the issue by filling in the peer address as gateway when generating the default route entry. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c diff --git a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch index 11af6d8..cea9e16 100644 --- a/package/network/services/ppp/patches/400-simplify_kernel_checks.patch +++ b/package/network/services/ppp/patches/400-simplify_kernel_checks.patch @@ -6,7 +6,7 @@ performing runtime checks, it just increases the binary size. This patch removes the runtime kernel feature checks. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c diff --git a/package/network/services/ppp/patches/401-no_record_file.patch b/package/network/services/ppp/patches/401-no_record_file.patch index f3c13ec..f5079fa 100644 --- a/package/network/services/ppp/patches/401-no_record_file.patch +++ b/package/network/services/ppp/patches/401-no_record_file.patch @@ -3,7 +3,7 @@ pppd: Remove the "record" option On many embedded systems there is not enough space to record PPP session information to the permanent storage, therfore remove this option. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/pppd.h +++ b/pppd/pppd.h diff --git a/package/network/services/ppp/patches/403-no_wtmp.patch b/package/network/services/ppp/patches/403-no_wtmp.patch index 3c78894..98d6133 100644 --- a/package/network/services/ppp/patches/403-no_wtmp.patch +++ b/package/network/services/ppp/patches/403-no_wtmp.patch @@ -3,7 +3,7 @@ pppd: Disable wtmp support Many uClibc based environments lack wtmp and utmp support, therfore remove the code updating the wtmp information. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c diff --git a/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch b/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch index edbca76..3b35fe0 100644 --- a/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch +++ b/package/network/services/ppp/patches/404-remove_obsolete_protocol_names.patch @@ -3,7 +3,7 @@ pppd: Remove historical protocol names Remove a number of historical protocol entries from pppd's builtin list, this reduced the binary size without loss of features. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/main.c +++ b/pppd/main.c diff --git a/package/network/services/ppp/patches/405-no_multilink_option.patch b/package/network/services/ppp/patches/405-no_multilink_option.patch index e8f99e5..b17747a 100644 --- a/package/network/services/ppp/patches/405-no_multilink_option.patch +++ b/package/network/services/ppp/patches/405-no_multilink_option.patch @@ -5,7 +5,7 @@ the multilink specific code. The motivation is to allow "nomp" even if pppd does not support multilink, so that controlling programs can unconditionally pass it to pppd regardless of the compile time features. -Signed-off-by: Jo-Philipp Wich +Signed-off-by: Jo-Philipp Wich --- a/pppd/options.c +++ b/pppd/options.c diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index bc3b00e..3408c94 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2015 Jo-Philipp Wich +# Copyright (C) 2010-2015 Jo-Philipp Wich # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index fd13e22..b69f8df 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -18,7 +18,7 @@ PKG_SOURCE_URL:= \ http://mirrors.evolva.ro/netfilter.org/conntrack-tools PKG_MD5SUM:=966a5d8f846ddf5304bcd12685c0707f -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 PKG_FIXUP:=autoreconf diff --git a/package/network/utils/dante/Makefile b/package/network/utils/dante/Makefile index ab05f8c..f73aa0b 100644 --- a/package/network/utils/dante/Makefile +++ b/package/network/utils/dante/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.inet.no/dante/files/ PKG_MD5SUM:=68c2ce12119e12cea11a90c7a80efa8f -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=BSD-4-Clause PKG_FIXUP:=autoreconf diff --git a/package/network/utils/iftop/Makefile b/package/network/utils/iftop/Makefile index bd82f2d..e4d0214 100644 --- a/package/network/utils/iftop/Makefile +++ b/package/network/utils/iftop/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download PKG_MD5SUM:=7e6decb4958e8a4890cccac335239f24 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index f1c50a9..1401262 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_MD5SUM:=8831b8f01458bf2abacc222884195a62 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 PKG_FIXUP:=autoreconf diff --git a/package/network/utils/iputils/Makefile b/package/network/utils/iputils/Makefile index 6f75236..11f3a7d 100644 --- a/package/network/utils/iputils/Makefile +++ b/package/network/utils/iputils/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-s$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.skbuff.net/iputils PKG_MD5SUM:=a36c25e9ec17e48be514dc0485e7376c -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0+ PKG_BUILD_DEPENDS:=sysfsutils diff --git a/package/network/utils/iwcap/Makefile b/package/network/utils/iwcap/Makefile index d3f8847..333344e 100644 --- a/package/network/utils/iwcap/Makefile +++ b/package/network/utils/iwcap/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 Jo-Philipp Wich +# Copyright (C) 2012 Jo-Philipp Wich # # This is free software, licensed under the Apache 2 license. # @@ -17,7 +17,7 @@ define Package/iwcap SECTION:=utils CATEGORY:=Utilities TITLE:=Simple radiotap capture utility - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich endef define Package/iwcap/description diff --git a/package/network/utils/iwcap/src/iwcap.c b/package/network/utils/iwcap/src/iwcap.c index d335e50..6bf25c5 100644 --- a/package/network/utils/iwcap/src/iwcap.c +++ b/package/network/utils/iwcap/src/iwcap.c @@ -1,7 +1,7 @@ /* * iwcap.c - A simply radiotap capture utility outputting pcap dumps * - * Copyright 2012 Jo-Philipp Wich + * Copyright 2012 Jo-Philipp Wich * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index f7e8303..4e442c3 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2016 Jo-Philipp Wich +# Copyright (C) 2010-2016 Jo-Philipp Wich # # This is free software, licensed under the GPL 2 license. # @@ -15,7 +15,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/iwinfo.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=e4aca3910dff532ed878d0ceaf1ab6e8ad7719bf PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 PKG_CONFIG_DEPENDS := \ diff --git a/package/network/utils/owipcalc/Makefile b/package/network/utils/owipcalc/Makefile index 9d6b397..b16f320 100644 --- a/package/network/utils/owipcalc/Makefile +++ b/package/network/utils/owipcalc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 Jo-Philipp Wich +# Copyright (C) 2012 Jo-Philipp Wich # # This is free software, licensed under the Apache 2 license. # @@ -17,7 +17,7 @@ define Package/owipcalc SECTION:=utils CATEGORY:=Utilities TITLE:=Simple IPv4/IPv6 address calculator - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich endef define Package/owipcalc/description diff --git a/package/network/utils/owipcalc/src/owipcalc.c b/package/network/utils/owipcalc/src/owipcalc.c index d22594b..f95280c 100644 --- a/package/network/utils/owipcalc/src/owipcalc.c +++ b/package/network/utils/owipcalc/src/owipcalc.c @@ -1,7 +1,7 @@ /* * owipcalc - OpenWrt IP Calculator * - * Copyright (C) 2012 Jo-Philipp Wich + * Copyright (C) 2012 Jo-Philipp Wich * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/package/network/utils/resolveip/Makefile b/package/network/utils/resolveip/Makefile index 3243a80..fc6da4e 100644 --- a/package/network/utils/resolveip/Makefile +++ b/package/network/utils/resolveip/Makefile @@ -17,7 +17,7 @@ define Package/resolveip SECTION:=utils CATEGORY:=Base system TITLE:=Simple DNS resolver with configurable timeout - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich endef define Package/resolveip/description diff --git a/package/network/utils/resolveip/src/resolveip.c b/package/network/utils/resolveip/src/resolveip.c index 43c5ae7..f7a918d 100644 --- a/package/network/utils/resolveip/src/resolveip.c +++ b/package/network/utils/resolveip/src/resolveip.c @@ -1,6 +1,6 @@ /* * Based on code found at https://dev.openwrt.org/ticket/4876 . - * Extended by Jo-Philipp Wich for use in OpenWrt. + * Extended by Jo-Philipp Wich for use in OpenWrt. * * You may use this program under the terms of the GPLv2 license. */ diff --git a/package/network/utils/xtables-addons/Makefile b/package/network/utils/xtables-addons/Makefile index da8058e..8dfbe82 100644 --- a/package/network/utils/xtables-addons/Makefile +++ b/package/network/utils/xtables-addons/Makefile @@ -20,7 +20,7 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_CHECK_FORMAT_SECURITY:=0 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 PKG_FIXUP:=autoreconf diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index af44742..67ceb7c 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -27,7 +27,7 @@ PKG_REMOVE_FILES = autogen.sh aclocal.m4 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_FLAGS := nonshared PKG_CONFIG_DEPENDS := CONFIG_SIGNED_PACKAGES diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 86bd8c5..6545c0d 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL=$(OPENWRT_GIT)/project/rpcd.git PKG_SOURCE_SUBDIR:=$(PKG_NAME) PKG_SOURCE_VERSION:=73aea9b8b621a1ce034bc6ee00c9d058a40c8a3d PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC PKG_LICENSE_FILES:= diff --git a/package/utils/jsonfilter/Makefile b/package/utils/jsonfilter/Makefile index 1cddd49..79cc385 100644 --- a/package/utils/jsonfilter/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -11,7 +11,7 @@ PKG_SOURCE_VERSION:=7151885df6ac2554c07cc6047dde7c4eb253ce87 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 -PKG_MAINTAINER:=Jo-Philipp Wich +PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=ISC include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile index cf2d887..4985452 100644 --- a/package/utils/lua/Makefile +++ b/package/utils/lua/Makefile @@ -33,7 +33,7 @@ define Package/lua/Default CATEGORY:=Languages TITLE:=Lua programming language URL:=http://www.lua.org/ - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich endef define Package/lua/Default/description diff --git a/package/utils/px5g/Makefile b/package/utils/px5g/Makefile index c886ae5..4714d93 100644 --- a/package/utils/px5g/Makefile +++ b/package/utils/px5g/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2015 Jo-Philipp Wich +# Copyright (C) 2010-2015 Jo-Philipp Wich # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -19,7 +19,7 @@ define Package/px5g SECTION:=utils CATEGORY:=Utilities TITLE:=X.509 certificate generator (using PolarSSL) - MAINTAINER:=Jo-Philipp Wich + MAINTAINER:=Jo-Philipp Wich DEPENDS:=+libpolarssl endef diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh index 508fe78..aba1cd6 100755 --- a/scripts/bundle-libraries.sh +++ b/scripts/bundle-libraries.sh @@ -2,7 +2,7 @@ # # Script to install host system binaries along with required libraries. # -# Copyright (C) 2012-2013 Jo-Philipp Wich +# Copyright (C) 2012-2013 Jo-Philipp Wich # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/ext-toolchain.sh b/scripts/ext-toolchain.sh index a552fbe..09390c5 100755 --- a/scripts/ext-toolchain.sh +++ b/scripts/ext-toolchain.sh @@ -3,7 +3,7 @@ # Script for various external toolchain tasks, refer to # the --help output for more information. # -# Copyright (C) 2012 Jo-Philipp Wich +# Copyright (C) 2012 Jo-Philipp Wich # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/scripts/srecimage.pl b/scripts/srecimage.pl index a68aa61..b9e2a84 100755 --- a/scripts/srecimage.pl +++ b/scripts/srecimage.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # # srecimage.pl - script to convert a binary image into srec -# Copyright (c) 2015 - Jo-Philipp Wich +# Copyright (c) 2015 - Jo-Philipp Wich # # This script is in the public domain. diff --git a/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch b/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch index 45f59a2..e9dae74 100644 --- a/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch +++ b/target/linux/generic/patches-3.18/615-netfilter_add_xt_id_match.patch @@ -51,7 +51,7 @@ +/* + * Implements a dummy match to allow attaching IDs to rules + * -+ * 2014-08-01 Jo-Philipp Wich ++ * 2014-08-01 Jo-Philipp Wich + */ + +#include @@ -59,7 +59,7 @@ +#include +#include + -+MODULE_AUTHOR("Jo-Philipp Wich "); ++MODULE_AUTHOR("Jo-Philipp Wich "); +MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_id"); diff --git a/target/linux/generic/patches-4.1/615-netfilter_add_xt_id_match.patch b/target/linux/generic/patches-4.1/615-netfilter_add_xt_id_match.patch index ba21d78..7d0fe27 100644 --- a/target/linux/generic/patches-4.1/615-netfilter_add_xt_id_match.patch +++ b/target/linux/generic/patches-4.1/615-netfilter_add_xt_id_match.patch @@ -51,7 +51,7 @@ +/* + * Implements a dummy match to allow attaching IDs to rules + * -+ * 2014-08-01 Jo-Philipp Wich ++ * 2014-08-01 Jo-Philipp Wich + */ + +#include @@ -59,7 +59,7 @@ +#include +#include + -+MODULE_AUTHOR("Jo-Philipp Wich "); ++MODULE_AUTHOR("Jo-Philipp Wich "); +MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_id"); diff --git a/target/linux/generic/patches-4.4/615-netfilter_add_xt_id_match.patch b/target/linux/generic/patches-4.4/615-netfilter_add_xt_id_match.patch index 8ee29a7..b403c79 100644 --- a/target/linux/generic/patches-4.4/615-netfilter_add_xt_id_match.patch +++ b/target/linux/generic/patches-4.4/615-netfilter_add_xt_id_match.patch @@ -51,7 +51,7 @@ +/* + * Implements a dummy match to allow attaching IDs to rules + * -+ * 2014-08-01 Jo-Philipp Wich ++ * 2014-08-01 Jo-Philipp Wich + */ + +#include @@ -59,7 +59,7 @@ +#include +#include + -+MODULE_AUTHOR("Jo-Philipp Wich "); ++MODULE_AUTHOR("Jo-Philipp Wich "); +MODULE_DESCRIPTION("Xtables: No-op match which can be tagged with a 32bit ID"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("ipt_id"); -- cgit v1.1