From e67df7f0c21914643c271902ac16dee531be93d7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 29 Sep 2012 19:33:48 +0200
Subject: [PATCH] xbps-git: remove patches applied to the master branch.

---
 .../patches/packages-on-hold-fix.patch        | 35 -------------------
 .../xbps_fixed_crash_in_search_target.patch   | 25 -------------
 srcpkgs/xbps-git/template                     |  2 +-
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 srcpkgs/xbps-git/patches/packages-on-hold-fix.patch
 delete mode 100644 srcpkgs/xbps-git/patches/xbps_fixed_crash_in_search_target.patch

diff --git a/srcpkgs/xbps-git/patches/packages-on-hold-fix.patch b/srcpkgs/xbps-git/patches/packages-on-hold-fix.patch
deleted file mode 100644
index 8ea2f92566e..00000000000
--- a/srcpkgs/xbps-git/patches/packages-on-hold-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-commit aa154199a6d7d89bfe040755be289b1d827c5727
-Author: Juan RP <xtraeme@gmail.com>
-Date:   Tue Sep 25 15:02:57 2012 +0200
-
-    xbps_transaction_update_packages: make packages on hold work (duh!).
-
-diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c
-index aa26279..666bd38 100644
---- lib/transaction_ops.c
-+++ lib/transaction_ops.c
-@@ -204,7 +204,7 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
- {
- 	prop_object_t obj;
- 	const char *pkgname, *holdpkgname;
--	bool newpkg_found = false;
-+	bool foundhold = false, newpkg_found = false;
- 	int rv = 0;
- 	size_t i, x;
- 
-@@ -219,9 +219,14 @@ xbps_transaction_update_packages(struct xbps_handle *xhp)
- 			if (strcmp(pkgname, holdpkgname) == 0) {
- 				xbps_dbg_printf(xhp, "[rpool] package %s on hold, "
- 				    "ignoring updates.\n", pkgname);
--				continue;
-+				foundhold = true;
-+				break;
- 			}
- 		}
-+		if (foundhold) {
-+			foundhold = false;
-+			continue;
-+		}
- 		rv = transaction_find_pkg(xhp, pkgname, false, true,
- 					  false, TRANS_UPDATE);
- 		if (rv == 0)
diff --git a/srcpkgs/xbps-git/patches/xbps_fixed_crash_in_search_target.patch b/srcpkgs/xbps-git/patches/xbps_fixed_crash_in_search_target.patch
deleted file mode 100644
index 314d3fc19b1..00000000000
--- a/srcpkgs/xbps-git/patches/xbps_fixed_crash_in_search_target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 4129a08cef7139b30b41ac659f35f9d494c2d918
-Author: Juan RP <xtraeme@gmail.com>
-Date:   Wed Sep 19 07:04:59 2012 +0200
-
-    xbps-{bin,repo}: fixed crash in 'show' target reported by pancake.
-
-diff --git a/bin/xbps-repo/show.c b/bin/xbps-repo/show.c
-index 170b1bd..f8265de 100644
---- bin/xbps-repo/show.c
-+++ bin/xbps-repo/show.c
-@@ -127,11 +127,12 @@ show_pkg_namedesc(struct xbps_handle *xhp,
- 
- 			len = strlen(inststr) + strlen(tmp) + strlen(desc) + 1;
- 			if (len > rsd->maxcols) {
--				out = malloc(rsd->maxcols);
-+				out = malloc(rsd->maxcols+1);
- 				assert(out);
--				snprintf(out, rsd->maxcols-2, "%s %s %s",
-+				snprintf(out, rsd->maxcols-3, "%s %s %s",
- 				    inststr, tmp, desc);
- 				strncat(out, "...", rsd->maxcols);
-+				out[rsd->maxcols+1] = '\0';
- 				printf("%s\n", out);
- 				free(out);
- 			} else {
diff --git a/srcpkgs/xbps-git/template b/srcpkgs/xbps-git/template
index 26f155f2bdb..d9aa331d6d9 100644
--- a/srcpkgs/xbps-git/template
+++ b/srcpkgs/xbps-git/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps-git'
 pkgname=xbps-git
 version="$(date -u +%Y%m%d)"
-revision=2
+revision=1
 nofetch=yes
 noextract=yes
 build_style=configure