summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2017-03-09 12:58:18 -0800
committerMichael Forney <mforney@mforney.org>2017-03-10 12:06:37 -0800
commit14b8f51876e6e290187f00fdb496af2fb84f9bfa (patch)
tree9a804c653dcdb6e557541c7e6eba7fa8986a0043
parent16d8ab7157909d785baeb13e29acf3b293dd542a (diff)
sdhcp: Use my github repository
-rw-r--r--.gitmodules3
-rw-r--r--pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch25
-rw-r--r--pkg/sdhcp/rev2
m---------pkg/sdhcp/src0
4 files changed, 2 insertions, 28 deletions
diff --git a/.gitmodules b/.gitmodules
index c8faf49a..f750f5c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -194,8 +194,7 @@
ignore = all
[submodule "pkg/sdhcp/src"]
path = pkg/sdhcp/src
- url = git://git.2f30.org/sdhcp
- ignore = all
+ url = https://github.com/michaelforney/sdhcp
[submodule "pkg/sinit/src"]
path = pkg/sinit/src
url = git://git.suckless.org/sinit
diff --git a/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch b/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
deleted file mode 100644
index a26237db..00000000
--- a/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 627a4c7b6869a4ba2b15308355082f39d2263b40 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 11 Dec 2016 00:14:16 -0800
-Subject: [PATCH] Convert cid to char * for strlcpy
-
----
- sdhcp.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sdhcp.c b/sdhcp.c
-index 5f829ad..c5f986a 100644
---- a/sdhcp.c
-+++ b/sdhcp.c
-@@ -466,7 +466,7 @@ main(int argc, char *argv[])
- if (argc)
- ifname = argv[0]; /* interface name */
- if (argc >= 2)
-- strlcpy(cid, argv[1], sizeof(cid)); /* client-id */
-+ strlcpy((char *)cid, argv[1], sizeof(cid)); /* client-id */
-
- memset(&ifreq, 0, sizeof(ifreq));
- signal(SIGALRM, nop);
---
-2.11.0
-
diff --git a/pkg/sdhcp/rev b/pkg/sdhcp/rev
index b8626c4c..7ed6ff82 100644
--- a/pkg/sdhcp/rev
+++ b/pkg/sdhcp/rev
@@ -1 +1 @@
-4
+5
diff --git a/pkg/sdhcp/src b/pkg/sdhcp/src
-Subproject 90b18e7b1cfcf7ab0799b917d7c4d1318ed29f5
+Subproject 5884501845ca22a13a7439d56fe457bcc4c9505