From 81e8270b3a084369c2816cde20e0c55828623aee Mon Sep 17 00:00:00 2001 From: Yaksh Bariya Date: Wed, 4 Aug 2021 16:34:52 +0530 Subject: [PATCH] Remove some patches --- packages/fossil/autosetup-cc.tcl.patch | 29 --------------------- packages/fossil/src-main.c.patch | 16 ------------ packages/fossil/src-user.c.patch | 35 -------------------------- 3 files changed, 80 deletions(-) delete mode 100644 packages/fossil/autosetup-cc.tcl.patch delete mode 100644 packages/fossil/src-main.c.patch delete mode 100644 packages/fossil/src-user.c.patch diff --git a/packages/fossil/autosetup-cc.tcl.patch b/packages/fossil/autosetup-cc.tcl.patch deleted file mode 100644 index 4e9ff4eb4..000000000 --- a/packages/fossil/autosetup-cc.tcl.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ./autosetup/cc.tcl 2021-07-02 18:16:01.000000000 +0530 -+++ ./autosetup/cc.tcl.mod 2021-08-03 07:04:16.933978205 +0530 -@@ -109,25 +109,7 @@ - # - # Checks that the given include files can be used. - proc cc-check-includes {args} { -- cc-check-some-feature $args { -- set with {} -- if {[dict exists $::autosetup(cc-include-deps) $each]} { -- set deps [dict keys [dict get $::autosetup(cc-include-deps) $each]] -- msg-quiet cc-check-includes {*}$deps -- foreach i $deps { -- if {[have-feature $i]} { -- lappend with $i -- } -- } -- } -- if {[llength $with]} { -- cc-with [list -includes $with] { -- cctest -includes $each -- } -- } else { -- cctest -includes $each -- } -- } -+ return 1 - } - - # @cc-include-needs include required ... diff --git a/packages/fossil/src-main.c.patch b/packages/fossil/src-main.c.patch deleted file mode 100644 index b1bc44e9d..000000000 --- a/packages/fossil/src-main.c.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ./src/main.c 2021-07-02 18:16:01.000000000 +0530 -+++ ./src/main.c.mod 2021-08-03 07:01:36.763978266 +0530 -@@ -351,11 +351,11 @@ - */ - db_unsave_encryption_key(); - #endif --#if defined(_WIN32) || (defined(__BIONIC__) && !defined(FOSSIL_HAVE_GETPASS)) -+#if defined(__ANDROID__) - /* - ** Free the secure getpass() buffer now. - */ -- freepass(); -+ fossil_freepass(); - #endif - #if defined(_WIN32) && !defined(_WIN64) && defined(FOSSIL_ENABLE_TCL) && \ - defined(USE_TCL_STUBS) diff --git a/packages/fossil/src-user.c.patch b/packages/fossil/src-user.c.patch deleted file mode 100644 index 66db3c22c..000000000 --- a/packages/fossil/src-user.c.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- ./src/user.c 2021-08-02 21:07:17.266953016 +0530 -+++ ./src/user.c.mod 2021-08-03 06:59:51.313978307 +0530 -@@ -51,7 +51,7 @@ - static char *zPwdBuffer = 0; - static size_t nPwdBuffer = 0; - --static char *getpass(const char *prompt){ -+static char *fossil_getpass(const char *prompt){ - char *zPwd; - size_t nPwd; - size_t i; -@@ -107,7 +107,7 @@ - assert( zPwd==zPwdBuffer ); - return zPwd; - } --void freepass(){ -+void fossil_freepass(){ - if( !zPwdBuffer ) return; - assert( nPwdBuffer>0 ); - fossil_secure_free_page(zPwdBuffer, nPwdBuffer); -@@ -221,12 +221,12 @@ - #endif - if( fossil_security_level()>=2 ){ - userGenerateScrambleCode(); -- z = getpass(zPrompt); -+ z = fossil_getpass(zPrompt); - if( z ) userDescramble(z); - printf("\033[3A\033[J"); /* Erase previous three lines */ - fflush(stdout); - }else{ -- z = getpass(zPrompt); -+ z = fossil_getpass(zPrompt); - } - strip_string(pPassphrase, z); - }