a30eaf3 fix pkg shell, now sqlite provides a mechanism to allow defining the function starting the shell without the need of patching shell.c anymore — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

fix pkg shell, now sqlite provides a mechanism to allow defining the function starting the shell without the need of patching shell.c anymore

Baptiste Daroussin committed 12 years ago

commit a30eaf3f6919954c11543b62c0985e9c3443e1df
parent 097899f

2 files changed +1 -6

modified external/Makefile.am

@@ -196,6 +196,7 @@ sqlite_common_cflags= -DHAVE_SQLITE_CONFIG_H \

 			-DUSE_PREAD \
 			-DSQLITE_THREADSAFE=1 \
 			-DSQLITE_TEMP_STORE=3 \
 			-DSQLITE_SHELL_DBNAME_PROC=pkgshell_open \
 			-Dmain=sqlite3_shell \
 			-DNDEBUG
 libsqlite_la_SOURCES=	sqlite/sqlite3.c \

modified external/sqlite/shell.c

@@ -3682,12 +3682,6 @@ int main(int argc, char **argv){

       warnInmemoryDb = 0; }
 #endif
   }
   /**** Begin pkgng patch losely based on fossil patch ****/
   {
     extern void pkgshell_open(const char **);
     pkgshell_open(&data.zDbFilename);
   }
   /**** End of pkgng patch ***/
   data.out = stdout;
   /* Go ahead and open the database file if it already exists.  If the