X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from sparky_64.resnet.local (unknown [74.117.189.85]) (using TLSv1 with cipher ECDHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: nangel@nothome.org) by mail.alpinelinux.org (Postfix) with ESMTPSA id 148FFDC1029; Wed, 20 Aug 2014 01:21:36 +0000 (UTC) From: Nathan Angelacos To: alpine-devel@lists.alpinelinux.org Cc: Nathan Angelacos Subject: [alpine-devel] [PATCH] main/knockd version bump 0.7 Date: Wed, 20 Aug 2014 01:21:27 +0000 Message-Id: <1408497687-2318-1-git-send-email-nangel@alpinelinux.org> X-Mailer: git-send-email 2.0.0 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/knock/APKBUILD | 26 ++++++--------- main/knock/fix-includes.patch | 11 ------- main/knock/path-max.patch | 75 ------------------------------------------- 3 files changed, 9 insertions(+), 103 deletions(-) delete mode 100644 main/knock/fix-includes.patch delete mode 100644 main/knock/path-max.patch diff --git a/main/knock/APKBUILD b/main/knock/APKBUILD index bdebb19..4728243 100644 --- a/main/knock/APKBUILD +++ b/main/knock/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Michael Mason # Maintainer: Natanael Copa pkgname=knock -pkgver=0.5 -pkgrel=3 +pkgver=0.7 +pkgrel=0 pkgdesc="A simple port-knocking daemon" url="http://www.zeroflux.org/projects/knock" arch="all" @@ -13,9 +13,7 @@ install= subpackages="$pkgname-doc" source="http://www.zeroflux.org/proj/knock/files/$pkgname-$pkgver.tar.gz knock.initd - knock.confd - fix-includes.patch - path-max.patch" + knock.confd" _builddir="$srcdir/$pkgname-$pkgver" @@ -52,18 +50,12 @@ package() { "$pkgdir"/etc/conf.d/knockd || return 1 } -md5sums="ca09d61458974cff90a700aba6120891 knock-0.5.tar.gz +md5sums="cb6373fd4ccb42eeca3ff406b7fdb8a7 knock-0.7.tar.gz 5f05196d700c04287523d184226e2dc2 knock.initd -8067d3b8401a0b5d513c44d3ff436032 knock.confd -a1085c6c669b774effc8e3df6ad69bb5 fix-includes.patch -1b7efd25668793c9248e530fd804cb54 path-max.patch" -sha256sums="c4c141166a10c45b139e5e656d0c98bbb99567abb35163863fc1df1a025cde15 knock-0.5.tar.gz +8067d3b8401a0b5d513c44d3ff436032 knock.confd" +sha256sums="9938479c321066424f74c61f6bee46dfd355a828263dc89561a1ece3f56578a4 knock-0.7.tar.gz a29db7f05c0454642706da297c60a32c8c539eb436942fa6bcf4eaec9ac18b55 knock.initd -569d0596f28e6df05aeff16331fa5b19c60e4d6a2e36eec57dc9ac377ba3b46e knock.confd -5863d81b2a52b85c5ede371371eb296cd0358ae0726ede4b01d8fc810a9be1f0 fix-includes.patch -98556f43e08eea53ef931b67de497d8bcf97fa09d52f3272ca8cfb91dcf7029f path-max.patch" -sha512sums="c5f7f3320d4d9a41847dba0cda4d66852f983db419b23d3bf9c83d44a41ba437379bf6cee47a096c600841e321740849dac26d5c3afff9b3ae0178a2fcb6c35e knock-0.5.tar.gz +569d0596f28e6df05aeff16331fa5b19c60e4d6a2e36eec57dc9ac377ba3b46e knock.confd" +sha512sums="eab5d855f7111d9411e84a56a15e8ea74f41c5bd9dee27ab49f0d8d509eeeb96a60c508928c92916dc0ec9b737c447ca8ca5ed4db6479b389549d60e76a85aa7 knock-0.7.tar.gz fd913590f29ea5d7cc813980e9d968a59ead17bb4ceafe456ece4a62da083888c7d7a4810bc0e947ce2d106e1910a150cc9b5c34bad98e594f09a62de76c9cec knock.initd -63fa311e6adf21450d4c93008a9537ec1b3c0dbed28e3daf955f2761127d9d756f2f7a84d8357d81a5e1a5a48453f9179d0c18cf18af0b9f30437c862a438d7f knock.confd -e2a7a7b802a0fa6fb43274a00509084413a2e3846e50e48966b0098f12c2bab5db8d45ef53db74f77f7857d39c2b9615a5f26cc0f5aad8506a0242a144483572 fix-includes.patch -b62f0f47b5fb6b7a40b25530d2ce87940a7f76225ececba269e29e5d7232735b810462bc670c6d523f48e097a383322b2217058240efca7efc3d54e06e18f6cf path-max.patch" +63fa311e6adf21450d4c93008a9537ec1b3c0dbed28e3daf955f2761127d9d756f2f7a84d8357d81a5e1a5a48453f9179d0c18cf18af0b9f30437c862a438d7f knock.confd" diff --git a/main/knock/fix-includes.patch b/main/knock/fix-includes.patch deleted file mode 100644 index 7093cba..0000000 --- a/main/knock/fix-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- knock-0.5.orig/src/knockd.c -+++ knock-0.5/src/knockd.c -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/main/knock/path-max.patch b/main/knock/path-max.patch deleted file mode 100644 index d4c398d..0000000 --- a/main/knock/path-max.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- knock-0.5.orig/src/knockd.c -+++ knock-0.5/src/knockd.c -@@ -131,9 +131,9 @@ - int o_daemon = 0; - int o_lookup = 0; - char o_int[32] = ""; /* default (eth0) is set after parseconfig() */ --char o_cfg[PATH_MAX] = "/etc/knockd.conf"; --char o_pidfile[PATH_MAX] = "/var/run/knockd.pid"; --char o_logfile[PATH_MAX] = ""; -+char o_cfg[4096] = "/etc/knockd.conf"; -+char o_pidfile[4096] = "/var/run/knockd.pid"; -+char o_logfile[4096] = ""; - - int main(int argc, char **argv) - { -@@ -435,7 +435,7 @@ - int parseconfig(char *configfile) - { - FILE *fp = NULL; -- char line[PATH_MAX+1]; -+ char line[4096+1]; - char *ptr = NULL; - char *key = NULL; - int linenum = 0; -@@ -448,7 +448,7 @@ - return(1); - } - -- while(fgets(line, PATH_MAX, fp)) { -+ while(fgets(line, 4096, fp)) { - linenum++; - trim(line); - if(strlen(line) == 0 || line[0] == '#') { -@@ -509,12 +509,12 @@ - trim(ptr); - if(!strcmp(section, "options")) { - if(!strcmp(key, "LOGFILE")) { -- strncpy(o_logfile, ptr, PATH_MAX-1); -- o_logfile[PATH_MAX-1] = '\0'; -+ strncpy(o_logfile, ptr, 4096-1); -+ o_logfile[4096-1] = '\0'; - dprint("config: log file: %s\n", o_logfile); - } else if(!strcmp(key, "PIDFILE")) { -- strncpy(o_pidfile, ptr, PATH_MAX-1); -- o_pidfile[PATH_MAX-1] = '\0'; -+ strncpy(o_pidfile, ptr, 4096-1); -+ o_pidfile[4096-1] = '\0'; - dprint("config: pid file: %s\n", o_pidfile); - } else if(!strcmp(key, "INTERFACE")) { - /* set interface only if it has not already been set by the -i switch */ -@@ -692,11 +692,11 @@ - */ - long get_next_one_time_sequence(opendoor_t *door) - { -- char line[PATH_MAX+1]; -+ char line[4096+1]; - int pos; - - pos = ftell(door->one_time_sequences_fd); -- while(fgets(line, PATH_MAX, door->one_time_sequences_fd)) { -+ while(fgets(line, 4096, door->one_time_sequences_fd)) { - trim(line); - if(strlen(line) == 0 || line[0] == '#') { - pos = ftell(door->one_time_sequences_fd); -@@ -1382,8 +1382,8 @@ - /* run the associated command */ - if(fork() == 0) { - /* child */ -- char parsed_start_cmd[PATH_MAX]; -- char parsed_stop_cmd[PATH_MAX]; -+ char parsed_start_cmd[4096]; -+ char parsed_stop_cmd[4096]; - size_t cmd_len = 0; - - setsid(); -- 2.0.0 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---