aboutsummaryrefslogtreecommitdiffstats
path: root/main/git
diff options
context:
space:
mode:
Diffstat (limited to 'main/git')
-rw-r--r--main/git/0001-config-add-_cb-suffix-to-callback-functions.patch6
-rw-r--r--main/git/APKBUILD6
2 files changed, 6 insertions, 6 deletions
diff --git a/main/git/0001-config-add-_cb-suffix-to-callback-functions.patch b/main/git/0001-config-add-_cb-suffix-to-callback-functions.patch
index db06341103..5a22944be2 100644
--- a/main/git/0001-config-add-_cb-suffix-to-callback-functions.patch
+++ b/main/git/0001-config-add-_cb-suffix-to-callback-functions.patch
@@ -1,6 +1,6 @@
diff -rupN a/config.c b/config.c
--- a/config.c 2013-09-27 01:49:38.000000000 +0200
-+++ b/config.c 2013-10-16 20:20:44.505672141 +0200
++++ b/config.c 2013-10-16 20:26:27.835675951 +0200
@@ -30,6 +30,9 @@ struct config_source {
int (*do_fgetc)(struct config_source *c);
int (*do_ungetc)(int c, struct config_source *conf);
@@ -16,7 +16,7 @@ diff -rupN a/config.c b/config.c
static int get_next_char(void)
{
- int c = cf->do_fgetc(cf);
-+ int c = cf->fgetc_cb(cf);
++ int c = cf->do_fgetc_cb(cf);
if (c == '\r') {
/* DOS like systems */
@@ -42,7 +42,7 @@ diff -rupN a/config.c b/config.c
top.do_fgetc = config_buf_fgetc;
top.do_ungetc = config_buf_ungetc;
top.do_ftell = config_buf_ftell;
-+ top.do_fget_cb = config_buf_fgetc;
++ top.do_fgetc_cb = config_buf_fgetc;
+ top.do_ungetc_cb = config_buf_ungetc;
+ top.do_ftell_cb = config_buf_ftell;
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 8e95a2b8b2..686ba170c7 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -76,17 +76,17 @@ svn() {
}
md5sums="5d8c89ad312ca0b0e603259c9357e6b8 git-1.8.4.1.tar.gz
-afe28707d4055f9f0a2bf2b642c99baf 0001-config-add-_cb-suffix-to-callback-functions.patch
+178d2d10f9740fac4a8af0155368b3d9 0001-config-add-_cb-suffix-to-callback-functions.patch
e63a201556c4f089de790805c09a2e5b bb-tar.patch
c92d9339a131e708cc65e1cac1e2520a git-daemon.initd
2258e95d389ccc6de0b5111d53d9eed6 git-daemon.confd"
sha256sums="f05c513a4a1d9d1ca1182ff43cfbccc1e8da0120f781aca415a5e3e1132451d3 git-1.8.4.1.tar.gz
-aa59ccb15eb88568a021e7739f49bad5468543509552be687a3ec9cd1e3dad5a 0001-config-add-_cb-suffix-to-callback-functions.patch
+c0f66913df49d35e197ff18426b2835a3bd539373c579d253cc4fcdf6c5b77c5 0001-config-add-_cb-suffix-to-callback-functions.patch
cb6319f47d81605e199771350154cbed0a6e85ef9042a689f2b405c64039f49c bb-tar.patch
02eb703e3638275104e12c8057f16b9a858ac5c8dc56d2e9ca68d7d3250a1917 git-daemon.initd
aaa80bd059db549dadf4c4e27a9aa41a4b5def844f8e563c493bc8513dcd981e git-daemon.confd"
sha512sums="2e8d98fc8f91a46e37b46cb10ffd4f623ee30e3607fda64e382664b78d11257716cc5aed54777d1ec64b96c40eb9e0ae3b968e06bec07b3a3315b60ad314a680 git-1.8.4.1.tar.gz
-29805415e7bd4e3a64805bcd2d0a8cf6824e81445636c82aee35cbfd645bb28b7673f429cec1b4cdad7051be4d77df6174bf0e04122af0e306056521959ddfb5 0001-config-add-_cb-suffix-to-callback-functions.patch
+3de27e2ff97be2673c218b86c5b0db515a6e6c603302ac158c8cb412e90f13b79381c432adcf661afcc2d5d0d156946bc85c2921c15066d20acf72defc0ce194 0001-config-add-_cb-suffix-to-callback-functions.patch
6fa088a753c2a697e8dbef2032ed63e8c2a0553a41cff2fcff893c2f35c51d2c697054cc921c23ee606f77b93d0f340df85220b15e1c470bd352f7fba3986cd0 bb-tar.patch
6321ea464f0c1d6245a0722e02ff3dc29996e41fb8d9f3c747bfdd914dc1284e6eb62a7d6057e4f99c0c8a23c3e57f9ff76f2cf18d19272f3cc599877f999c41 git-daemon.initd
9640f8078d68ed2678e5249da3f946fc21f50e858b94127a4221de73c6132101afcd46bc1fe33861e9a7f731c0dc9591915b8ebf376b8e690cd7135703966509 git-daemon.confd"