From: tobi@debian.org   
      
   This is a multi-part MIME message sent by reportbug.   
      
      
   Source: snuffleupagus   
   Version: 0.12.0-1   
   Severity: normal   
   Tags: patch   
      
   Hi Christian,   
      
   attached is a patch to build against the packaged libcrypto++   
      
   Note, it does not:   
   - add a BD on librypto++-ev   
   - remove tweetnacl.{c,h} from the source   
   - remove the then-obsolete patch   
      
   --   
   Cheers,   
   tobi   
      
      
   -- System Information:   
   Debian Release: forky/sid   
     APT prefers stable-updates   
     APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500,   
   'proposed-updates'), (500, 'oldstable-security'), (500, 'unstable'), (500,   
   'stable'), (1, 'experimental'), (1, 'oldstable')   
   Architecture: amd64 (x86_64)   
   Foreign Architectures: i386   
      
   Kernel: Linux 6.18.10+deb14-amd64 (SMP w/12 CPU threads; PREEMPT)   
   Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE   
   Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),    
   ANGUAGE=en_US:en   
   Shell: /bin/sh linked to /usr/bin/dash   
   Init: systemd (via /run/systemd/system)   
   LSM: AppArmor: enabled   
      
   --- a/src/sp_crypt.h   
   +++ b/src/sp_crypt.h   
   @@ -2,7 +2,7 @@   
    #define __SP_CRYPT   
      
    #include "SAPI.h"   
   -#include "tweetnacl.h"   
   +#include "crypto++/tweetnacl.h"   
      
    #include "sp_utils.h"   
      
   --- a/src/sp_session.h   
   +++ b/src/sp_session.h   
   @@ -1,5 +1,5 @@   
    #include "SAPI.h"   
   -#include "tweetnacl.h"   
   +#include "crypto++/tweetnacl.h"   
      
    #include "sp_utils.h"   
      
   --- a/Makefile   
   +++ b/Makefile   
   @@ -58,7 +58,6 @@   
    	sed -i "s/\$$ext_params -d display_errors=0 -r/-d display_errors=0 -r/"   
   $(SRC)/run-tests.php   
    	TEST_PHP_ARGS='-q' REPORT_EXIT_STATUS=1 make -C $(SRC) test   
    	lcov --base-directory ./$(SRC) --directory ./$(SRC) -c -o ./$(SRC)/COV.info   
   --rc lcov_branch_coverage=1   
   -	lcov --remove $(SRC)/COV.info '/usr/*' --remove $(SRC)/COV.info   
   '*tweetnacl.c' -o $(SRC)/COV.info --rc lcov_branch_coverage=1   
    	genhtml --show-details -o $(SRC)/COV.html ./$(SRC)/COV.info  -   
   branch-coverage   
    endif   
      
   --- a/src/config.m4   
   +++ b/src/config.m4   
   @@ -4,7 +4,7 @@   
    sources="snuffleupagus.c sp_config.c sp_config_utils.c sp_harden_rand.c"   
    sources="$sources sp_unserialize.c sp_utils.c sp_disable_xxe.c sp_list.c"   
    sources="$sources sp_disabled_functions.c sp_execute.c sp_upload_validation.c"   
   -sources="$sources sp_cookie_encryption.c sp_network_utils.c tweetnacl.c"   
   +sources="$sources sp_cookie_encryption.c sp_network_utils.c"   
    sources="$sources sp_config_keywords.c sp_var_parser.c sp_var_value.c   
   sp_tree.c"   
    sources="$sources sp_pcre_compat.c sp_crypt.c sp_session.c sp_sloppy.c   
   sp_wrapper.c"   
    sources="$sources sp_ini.c sp_php_compat.c sp_config_scanner.c sp_ifilter.c"   
   @@ -31,7 +31,7 @@   
    CFLAGS="$CFLAGS -Wmissing-format-attribute -Wmissing-noreturn -Wpointer-arith"   
    CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused -Wwrite-strings"   
      
   -LDFLAGS="$LDFLAGS `pcre2-config --libs8`"   
   +LDFLAGS="$LDFLAGS `pcre2-config --libs8` `pkg-config --libs libcrypto++`"   
      
    AX_CHECK_COMPILE_FLAG([-Wl,-z,relro,-z,now], [LDFLAGS="$LDFLAGS   
   -Wl,-z,relro,-z,now"], {}, [-Werror])   
      
   --- SoupGate-Win32 v1.05   
    * Origin: you cannot sedate... all the things you hate (1:229/2)