Ticket #4945: privoxy.3.patch

File privoxy.3.patch, 6.1 KB (added by puchu, 9 years ago)

one update more :)

  • files/privoxy.config

     
    11confdir /etc/privoxy 
    22logdir /var/log 
    3 actionsfile standard.action  # Internal purpose, recommended 
     3filterfile default.filter 
     4logfile privoxy 
     5actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on. 
    46actionsfile default.action   # Main actions file 
    5 actionsfile user.action      # User customizations 
    6 filterfile default.filter 
    7 logfile logfile 
    8 jarfile jarfile 
    9 trust-info-url  http://www.example.com/why_we_block.html 
    10 trust-info-url  http://www.example.com/what_we_allow.html 
    11 #admin-address privoxy-admin@example.com 
    12 #proxy-info-url http://www.example.com/proxy-service.html 
    13 debug   1    # show each GET/POST/CONNECT request 
    14 debug   4096 # Startup banner and warnings 
    15 debug   8192 # Errors - *we highly recommended enabling this* 
     7#actionsfile user.action      # User customizations 
    168listen-address  127.0.0.1:8118 
    179toggle  1 
    1810enable-remote-toggle  1 
     11enable-remote-http-toggle  0 
    1912enable-edit-actions 1 
     13enforce-blocks 0 
     14buffer-limit 4096 
     15forwarded-connect-retries  0 
     16accept-intercepted-requests 0 
     17allow-cgi-request-crunching 0 
     18split-large-forms 0 
     19keep-alive-timeout 300 
     20socket-timeout 300 
    2021permit-access  192.168.1.0/24 
    21 buffer-limit 4096 
     22debug   1    # show each GET/POST/CONNECT request 
     23debug   4096 # Startup banner and warnings 
     24debug   8192 # Errors - *we highly recommended enabling this* 
     25#admin-address privoxy-admin@example.com 
     26#proxy-info-url http://www.example.com/proxy-service.html 
     27 
  • patches/101-destdir.patch

     
    1 Index: privoxy-3.0.6-stable/GNUmakefile.in 
    2 =================================================================== 
    3 --- privoxy-3.0.6-stable.orig/GNUmakefile.in    2007-06-21 14:51:38.000000000 +0200 
    4 +++ privoxy-3.0.6-stable/GNUmakefile.in 2007-06-21 14:51:38.000000000 +0200 
    5 @@ -55,15 +55,15 @@ 
    6  USER         = @USER@ 
    7  GROUP     = @GROUP@ 
    8   
    9 -prefix       = @prefix@ 
    10 -exec_prefix  = @exec_prefix@ 
    11 -CONF_BASE    = @sysconfdir@ 
    12 -SBIN_DEST    = @sbindir@ 
    13 -MAN_DIR      = @mandir@ 
    14 +prefix       = $(DESTDIR)@prefix@ 
    15 +exec_prefix  = $(DESTDIR)@exec_prefix@ 
    16 +CONF_BASE    = $(DESTDIR)@sysconfdir@ 
    17 +SBIN_DEST    = $(DESTDIR)@sbindir@ 
    18 +MAN_DIR      = $(DESTDIR)@mandir@ 
    19  MAN_DEST     = $(MAN_DIR)/man1 
    20 -SHARE_DEST   = @datadir@ 
    21 +SHARE_DEST   = $(DESTDIR)@datadir@ 
    22  DOC_DEST     = $(SHARE_DEST)/doc/privoxy 
    23 -VAR_DEST     = @localstatedir@ 
    24 +VAR_DEST     = $(DESTDIR)@localstatedir@ 
    25  LOGS_DEST    = $(VAR_DEST)/log/privoxy 
    26  PIDS_DEST    = $(VAR_DEST)/run 
    27   
  • patches/102-remove_rej_files.patch

     
     1diff -burN privoxy-3.0.12-stable/jcc.c.rej privoxy-3.0.12-stable.patched/jcc.c.rej 
     2--- privoxy-3.0.12-stable/jcc.c.rej     2008-11-26 18:56:54.000000000 +0100 
     3+++ privoxy-3.0.12-stable.patched/jcc.c.rej     1970-01-01 01:00:00.000000000 +0100 
     4@@ -1,20 +0,0 @@ 
     5-*************** 
     6-*** 3110,3118 **** 
     7-           } 
     8-           continue; 
     9-        } 
     10--       log_error(LOG_LEVEL_INFO, 
     11--          "Shouldn't get here but did."); 
     12--       return; 
     13-     } 
     14 
     15-     if (csp->content_length == 0) 
     16---- 3120,3127 ---- 
     17-           } 
     18-           continue; 
     19-        } 
     20-+       mark_server_socket_tainted(csp); 
     21-+       return; /* huh? we should never get here */ 
     22-     } 
     23 
     24-     if (csp->content_length == 0) 
     25diff -burN privoxy-3.0.12-stable/parsers.c.rej privoxy-3.0.12-stable.patched/parsers.c.rej 
     26--- privoxy-3.0.12-stable/parsers.c.rej 2008-09-15 19:52:19.000000000 +0200 
     27+++ privoxy-3.0.12-stable.patched/parsers.c.rej 1970-01-01 01:00:00.000000000 +0100 
     28@@ -1,16 +0,0 @@ 
     29-*************** 
     30-*** 986,991 **** 
     31-  const add_header_func_ptr add_client_headers[] = { 
     32-     client_host_adder, 
     33-     client_cookie_adder, 
     34-     client_xtra_adder, 
     35-     /* Temporarily disabled:    client_accept_encoding_adder, */ 
     36-     connection_close_adder, 
     37---- 983,989 ---- 
     38-  const add_header_func_ptr add_client_headers[] = { 
     39-     client_host_adder, 
     40-     client_cookie_adder, 
     41-+    client_x_forwarded_adder, 
     42-     client_xtra_adder, 
     43-     /* Temporarily disabled:    client_accept_encoding_adder, */ 
     44-     connection_close_adder, 
  • patches/100-crosscompile.patch

     
    1 Index: privoxy-3.0.6-stable/configure.in 
    2 =================================================================== 
    3 --- privoxy-3.0.6-stable.orig/configure.in      2007-06-21 14:51:38.000000000 +0200 
    4 +++ privoxy-3.0.6-stable/configure.in   2007-06-21 14:51:38.000000000 +0200 
    5 @@ -1125,7 +1125,8 @@ 
    6  AC_PROG_GCC_TRADITIONAL 
    7  dnl uncommenting does not work for swa. suse linux 
    8  dnl AC_FUNC_MALLOC 
    9 -AC_FUNC_SETPGRP 
    10 +dnl uncommenting does not work for openwrt 
    11 +dnl AC_FUNC_SETPGRP 
    12  AC_TYPE_SIGNAL 
    13  dnl uncommenting does not work for swa. suse linux 
    14  dnl AC_FUNC_STAT 
  • Makefile

     
    99include $(TOPDIR)/rules.mk 
    1010 
    1111PKG_NAME:=privoxy 
    12 PKG_VERSION:=3.0.8 
    13 PKG_RELEASE:=3 
     12PKG_VERSION:=3.0.12 
     13PKG_RELEASE:=1 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable-src.tar.gz 
    1616PKG_SOURCE_URL:=@SF/ijbswa 
    17 PKG_MD5SUM:=252c0e085218fb930c4bc7563e9cedd9 
     17PKG_MD5SUM:=c973e608d27b248ef567b47664308da1 
    1818 
    1919PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable 
    2020 
     
    4646        ) 
    4747endef 
    4848 
    49 define Build/Compile     
     49define Build/Compile 
    5050        $(MAKE) -C $(PKG_BUILD_DIR) \ 
    5151                SPECIAL_CFLAGS="-pthread -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" 
    5252        mkdir -p $(PKG_INSTALL_DIR) 
     
    5757 
    5858define Package/privoxy/conffiles 
    5959/etc/privoxy/config 
    60 /etc/privoxy/user.action 
    6160endef 
    6261 
    6362define Package/privoxy/install