From 12c9a1e0c95be8d3a31886f1844212421b4a452d Mon Sep 17 00:00:00 2001
From: Butta <repo@butta.fastem.com>
Date: Sun, 16 Aug 2020 14:03:42 +0530
Subject: [PATCH] Fix chezmoi and bump gnunet, jfrog-cli, and libpsl

---
 packages/chezmoi/pass-no-unlock.patch | 70 ---------------------------
 packages/gnunet/build.sh              |  1 +
 packages/jfrog-cli/build.sh           |  2 +-
 packages/libpsl/build.sh              |  1 -
 4 files changed, 2 insertions(+), 72 deletions(-)
 delete mode 100644 packages/chezmoi/pass-no-unlock.patch

diff --git a/packages/chezmoi/pass-no-unlock.patch b/packages/chezmoi/pass-no-unlock.patch
deleted file mode 100644
index 145728df0..000000000
--- a/packages/chezmoi/pass-no-unlock.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/cmd/secretpass.go b/cmd/secretpass.go
-index ec3c091..f762b5d 100644
---- a/cmd/secretpass.go
-+++ b/cmd/secretpass.go
-@@ -3,6 +3,7 @@ package cmd
- import (
- 	"bytes"
- 	"fmt"
-+	"os"
- 	"os/exec"
- 
- 	"github.com/spf13/cobra"
-@@ -18,8 +19,7 @@ var passCmd = &cobra.Command{
- }
- 
- type passCmdConfig struct {
--	Command  string
--	unlocked bool
-+	Command string
- }
- 
- var passCache = make(map[string]string)
-@@ -40,19 +40,10 @@ func (c *Config) passFunc(id string) string {
- 		return s
- 	}
- 	name := c.Pass.Command
--	if !c.Pass.unlocked {
--		args := []string{"grep", "^$"}
--		cmd := exec.Command(name, args...)
--		cmd.Stdin = c.Stdin
--		cmd.Stdout = c.Stdout
--		cmd.Stderr = c.Stderr
--		if err := cmd.Run(); err != nil {
--			panic(fmt.Errorf("%s %s: %w", name, chezmoi.ShellQuoteArgs(args), err))
--		}
--		c.Pass.unlocked = true
--	}
- 	args := []string{"show", id}
- 	cmd := exec.Command(name, args...)
-+	cmd.Stdin = os.Stdin
-+	cmd.Stderr = os.Stderr
- 	output, err := c.mutator.IdempotentCmdOutput(cmd)
- 	if err != nil {
- 		panic(fmt.Errorf("%s %s: %w", name, chezmoi.ShellQuoteArgs(args), err))
-diff --git a/testdata/scripts/secretpass.txt b/testdata/scripts/secretpass.txt
-index c606c7f..f9a79c7 100644
---- a/testdata/scripts/secretpass.txt
-+++ b/testdata/scripts/secretpass.txt
-@@ -8,8 +8,6 @@ cmp $HOME/.netrc golden/.netrc
- #!/bin/sh
- 
- case "$*" in
--"grep ^$")
--    ;;
- "show misc/example.com")
-     echo "examplepassword"
-     ;;
-@@ -19,11 +17,7 @@ case "$*" in
- esac
- -- bin/pass.cmd --
- @echo off
--REM Windows drops the leading ^ from the ^$ argument that chezmoi passes to "pass grep" so match on $ only.
--REM For background information, read http://daviddeley.com/autohotkey/parameters/parameters.htm#WIN.
--IF "%*" == "grep $" (
--    exit /b 0
--) ELSE IF "%*" == "show misc/example.com" (
-+IF "%*" == "show misc/example.com" (
-     echo | set /p=examplepassword
-     exit /b 0
- ) ELSE (
diff --git a/packages/gnunet/build.sh b/packages/gnunet/build.sh
index 28075fd29..e6847538e 100644
--- a/packages/gnunet/build.sh
+++ b/packages/gnunet/build.sh
@@ -7,6 +7,7 @@ TERMUX_PKG_DEPENDS="gnurl, libgcrypt, libgmp, libidn, libjansson, libltdl, libmi
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_have_decl_struct_in6_ifreq=yes"
 
+#bump
 termux_step_pre_configure() {
 	CPPFLAGS+=" -D_LINUX_IN6_H"
 	./bootstrap
diff --git a/packages/jfrog-cli/build.sh b/packages/jfrog-cli/build.sh
index 007fdd9b5..367b174af 100644
--- a/packages/jfrog-cli/build.sh
+++ b/packages/jfrog-cli/build.sh
@@ -18,7 +18,7 @@ termux_step_make() {
 		# "linux" tag should not be necessary
 		# try removing when golang version is upgraded
 
-	# Building for host to generate manpages and completion.
+	#Building for host to generate manpages and completion.
 	chmod 700 -R $GOPATH/pkg && rm -rf $GOPATH/pkg
 	unset GOOS GOARCH CGO_LDFLAGS
 	unset CC CXX CFLAGS CXXFLAGS LDFLAGS
diff --git a/packages/libpsl/build.sh b/packages/libpsl/build.sh
index 0b6ec7dab..a869a1a69 100644
--- a/packages/libpsl/build.sh
+++ b/packages/libpsl/build.sh
@@ -8,7 +8,6 @@ TERMUX_PKG_DEPENDS="libidn2, libunistring"
 TERMUX_PKG_BREAKS="libpsl-dev"
 TERMUX_PKG_REPLACES="libpsl-dev"
 
-#bump
 termux_step_pre_configure() {
 	autoreconf -fiv
 }