etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
+#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
#usr/include/curl/typecheck-gcc.h
#usr/lib/libcurl.a
#usr/lib/libcurl.la
-usr/lib/libcurl.so
+#usr/lib/libcurl.so
usr/lib/libcurl.so.3
usr/lib/libcurl.so.4
-usr/lib/libcurl.so.4.3.0
+usr/lib/libcurl.so.4.4.0
#usr/lib/pkgconfig/libcurl.pc
#usr/share/aclocal/libcurl.m4
#usr/share/man/man1/curl-config.1
#usr/share/man/man1/curl.1
+#usr/share/man/man3/CURLINFO_ACTIVESOCKET.3
+#usr/share/man/man3/CURLINFO_APPCONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_CERTINFO.3
+#usr/share/man/man3/CURLINFO_CONDITION_UNMET.3
+#usr/share/man/man3/CURLINFO_CONNECT_TIME.3
+#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_CONTENT_LENGTH_UPLOAD.3
+#usr/share/man/man3/CURLINFO_CONTENT_TYPE.3
+#usr/share/man/man3/CURLINFO_COOKIELIST.3
+#usr/share/man/man3/CURLINFO_EFFECTIVE_URL.3
+#usr/share/man/man3/CURLINFO_FILETIME.3
+#usr/share/man/man3/CURLINFO_FTP_ENTRY_PATH.3
+#usr/share/man/man3/CURLINFO_HEADER_SIZE.3
+#usr/share/man/man3/CURLINFO_HTTPAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_HTTP_CONNECTCODE.3
+#usr/share/man/man3/CURLINFO_LASTSOCKET.3
+#usr/share/man/man3/CURLINFO_LOCAL_IP.3
+#usr/share/man/man3/CURLINFO_LOCAL_PORT.3
+#usr/share/man/man3/CURLINFO_NAMELOOKUP_TIME.3
+#usr/share/man/man3/CURLINFO_NUM_CONNECTS.3
+#usr/share/man/man3/CURLINFO_OS_ERRNO.3
+#usr/share/man/man3/CURLINFO_PRETRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_PRIMARY_IP.3
+#usr/share/man/man3/CURLINFO_PRIMARY_PORT.3
+#usr/share/man/man3/CURLINFO_PRIVATE.3
+#usr/share/man/man3/CURLINFO_PROXYAUTH_AVAIL.3
+#usr/share/man/man3/CURLINFO_REDIRECT_COUNT.3
+#usr/share/man/man3/CURLINFO_REDIRECT_TIME.3
+#usr/share/man/man3/CURLINFO_REDIRECT_URL.3
+#usr/share/man/man3/CURLINFO_REQUEST_SIZE.3
+#usr/share/man/man3/CURLINFO_RESPONSE_CODE.3
+#usr/share/man/man3/CURLINFO_RTSP_CLIENT_CSEQ.3
+#usr/share/man/man3/CURLINFO_RTSP_CSEQ_RECV.3
+#usr/share/man/man3/CURLINFO_RTSP_SERVER_CSEQ.3
+#usr/share/man/man3/CURLINFO_RTSP_SESSION_ID.3
+#usr/share/man/man3/CURLINFO_SIZE_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_SIZE_UPLOAD.3
+#usr/share/man/man3/CURLINFO_SPEED_DOWNLOAD.3
+#usr/share/man/man3/CURLINFO_SPEED_UPLOAD.3
+#usr/share/man/man3/CURLINFO_SSL_ENGINES.3
+#usr/share/man/man3/CURLINFO_SSL_VERIFYRESULT.3
+#usr/share/man/man3/CURLINFO_STARTTRANSFER_TIME.3
+#usr/share/man/man3/CURLINFO_TLS_SESSION.3
+#usr/share/man/man3/CURLINFO_TLS_SSL_PTR.3
+#usr/share/man/man3/CURLINFO_TOTAL_TIME.3
#usr/share/man/man3/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3
#usr/share/man/man3/CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3
#usr/share/man/man3/CURLMOPT_MAXCONNECTS.3
#usr/share/man/man3/CURLMOPT_PIPELINING.3
#usr/share/man/man3/CURLMOPT_PIPELINING_SERVER_BL.3
#usr/share/man/man3/CURLMOPT_PIPELINING_SITE_BL.3
+#usr/share/man/man3/CURLMOPT_PUSHDATA.3
+#usr/share/man/man3/CURLMOPT_PUSHFUNCTION.3
#usr/share/man/man3/CURLMOPT_SOCKETDATA.3
#usr/share/man/man3/CURLMOPT_SOCKETFUNCTION.3
#usr/share/man/man3/CURLMOPT_TIMERDATA.3
#usr/share/man/man3/CURLOPT_CUSTOMREQUEST.3
#usr/share/man/man3/CURLOPT_DEBUGDATA.3
#usr/share/man/man3/CURLOPT_DEBUGFUNCTION.3
+#usr/share/man/man3/CURLOPT_DEFAULT_PROTOCOL.3
#usr/share/man/man3/CURLOPT_DIRLISTONLY.3
#usr/share/man/man3/CURLOPT_DNS_CACHE_TIMEOUT.3
#usr/share/man/man3/CURLOPT_DNS_INTERFACE.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3
#usr/share/man/man3/CURLOPT_STDERR.3
+#usr/share/man/man3/CURLOPT_STREAM_DEPENDS.3
+#usr/share/man/man3/CURLOPT_STREAM_DEPENDS_E.3
+#usr/share/man/man3/CURLOPT_STREAM_WEIGHT.3
#usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
#usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
#usr/share/man/man3/CURLOPT_TCP_KEEPINTVL.3
#usr/share/man/man3/CURLOPT_TCP_NODELAY.3
#usr/share/man/man3/CURLOPT_TELNETOPTIONS.3
#usr/share/man/man3/CURLOPT_TFTP_BLKSIZE.3
+#usr/share/man/man3/CURLOPT_TFTP_NO_OPTIONS.3
#usr/share/man/man3/CURLOPT_TIMECONDITION.3
#usr/share/man/man3/CURLOPT_TIMEOUT.3
#usr/share/man/man3/CURLOPT_TIMEOUT_MS.3
#usr/share/man/man3/libcurl-multi.3
#usr/share/man/man3/libcurl-share.3
#usr/share/man/man3/libcurl-symbols.3
+#usr/share/man/man3/libcurl-thread.3
#usr/share/man/man3/libcurl-tutorial.3
#usr/share/man/man3/libcurl.3
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_curl
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
+#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
+#usr/bin/sas_disk_blink
+#usr/bin/scsi_ch_swp
usr/bin/sdparm
+#usr/share/man/man8/sas_disk_blink.8
+#usr/share/man/man8/scsi_ch_swp.8
#usr/share/man/man8/sdparm.8
etc/squid/errors
etc/squid/mime.conf
#etc/squid/mime.conf.default
-etc/squid/msntauth.conf
-#etc/squid/msntauth.conf.default
etc/squid/squid.conf
#etc/squid/squid.conf.default
#etc/squid/squid.conf.documented
usr/lib/squid/basic_fake_auth
usr/lib/squid/basic_getpwnam_auth
usr/lib/squid/basic_ldap_auth
-usr/lib/squid/basic_msnt_auth
usr/lib/squid/basic_msnt_multi_domain_auth
usr/lib/squid/basic_ncsa_auth
usr/lib/squid/basic_nis_auth
usr/lib/squid/basic_sasl_auth
usr/lib/squid/basic_smb_auth
usr/lib/squid/basic_smb_auth.sh
+usr/lib/squid/basic_smb_lm_auth
#usr/lib/squid/cachemgr.cgi
-usr/lib/squid/cert_tool
+usr/lib/squid/digest_edirectory_auth
usr/lib/squid/digest_file_auth
usr/lib/squid/digest_ldap_auth
usr/lib/squid/diskd
#usr/lib/squid/errors/es-pr
#usr/lib/squid/errors/es-py
#usr/lib/squid/errors/es-sv
+#usr/lib/squid/errors/es-us
#usr/lib/squid/errors/es-uy
#usr/lib/squid/errors/es-ve
usr/lib/squid/errors/es/ERR_ACCESS_DENIED
#usr/lib/squid/errors/ja/ERR_WRITE_ERROR
#usr/lib/squid/errors/ja/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/ja/error-details.txt
+#usr/lib/squid/errors/ka
+#usr/lib/squid/errors/ka/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/ka/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/ka/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/ka/ERR_AGENT_WPAD
+#usr/lib/squid/errors/ka/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/ka/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/ka/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/ka/ERR_CONFLICT_HOST
+#usr/lib/squid/errors/ka/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/ka/ERR_DIR_LISTING
+#usr/lib/squid/errors/ka/ERR_DNS_FAIL
+#usr/lib/squid/errors/ka/ERR_ESI
+#usr/lib/squid/errors/ka/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/ka/ERR_FTP_DISABLED
+#usr/lib/squid/errors/ka/ERR_FTP_FAILURE
+#usr/lib/squid/errors/ka/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/ka/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/ka/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/ka/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/ka/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/ka/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/ka/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/ka/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/ka/ERR_INVALID_REQ
+#usr/lib/squid/errors/ka/ERR_INVALID_RESP
+#usr/lib/squid/errors/ka/ERR_INVALID_URL
+#usr/lib/squid/errors/ka/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/ka/ERR_NO_RELAY
+#usr/lib/squid/errors/ka/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/ka/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/ka/ERR_READ_ERROR
+#usr/lib/squid/errors/ka/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/ka/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/ka/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/ka/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/ka/ERR_TOO_BIG
+#usr/lib/squid/errors/ka/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/ka/ERR_UNSUP_REQ
+#usr/lib/squid/errors/ka/ERR_URN_RESOLVE
+#usr/lib/squid/errors/ka/ERR_WRITE_ERROR
+#usr/lib/squid/errors/ka/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/ka/error-details.txt
+#usr/lib/squid/errors/ka-ge
#usr/lib/squid/errors/ko
#usr/lib/squid/errors/ko-kp
#usr/lib/squid/errors/ko-kr
#usr/lib/squid/errors/sl/error-details.txt
#usr/lib/squid/errors/sr
#usr/lib/squid/errors/sr-cyrl
+#usr/lib/squid/errors/sr-cyrl-cs
+#usr/lib/squid/errors/sr-cyrl-me
+#usr/lib/squid/errors/sr-cyrl-rs
#usr/lib/squid/errors/sr-cyrl/ERR_ACCESS_DENIED
#usr/lib/squid/errors/sr-cyrl/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/sr-cyrl/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/sr-cyrl/error-details.txt
#usr/lib/squid/errors/sr-latn
#usr/lib/squid/errors/sr-latn-cs
+#usr/lib/squid/errors/sr-latn-me
+#usr/lib/squid/errors/sr-latn-rs
#usr/lib/squid/errors/sr-latn/ERR_ACCESS_DENIED
#usr/lib/squid/errors/sr-latn/ERR_ACL_TIME_QUOTA_EXCEEDED
#usr/lib/squid/errors/sr-latn/ERR_AGENT_CONFIGURE
#usr/lib/squid/errors/sr-latn/ERR_WRITE_ERROR
#usr/lib/squid/errors/sr-latn/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/sr-latn/error-details.txt
+#usr/lib/squid/errors/sr-rs
#usr/lib/squid/errors/sr-sp
#usr/lib/squid/errors/sv
#usr/lib/squid/errors/sv-fi
#usr/lib/squid/errors/vi/ERR_ZERO_SIZE_OBJECT
#usr/lib/squid/errors/vi/error-details.txt
#usr/lib/squid/errors/zh-cn
-#usr/lib/squid/errors/zh-cn/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/zh-cn/ERR_ACL_TIME_QUOTA_EXCEEDED
-#usr/lib/squid/errors/zh-cn/ERR_AGENT_CONFIGURE
-#usr/lib/squid/errors/zh-cn/ERR_AGENT_WPAD
-#usr/lib/squid/errors/zh-cn/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/zh-cn/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/zh-cn/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/zh-cn/ERR_CONFLICT_HOST
-#usr/lib/squid/errors/zh-cn/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/zh-cn/ERR_DIR_LISTING
-#usr/lib/squid/errors/zh-cn/ERR_DNS_FAIL
-#usr/lib/squid/errors/zh-cn/ERR_ESI
-#usr/lib/squid/errors/zh-cn/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/zh-cn/ERR_FTP_DISABLED
-#usr/lib/squid/errors/zh-cn/ERR_FTP_FAILURE
-#usr/lib/squid/errors/zh-cn/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/zh-cn/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/zh-cn/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/zh-cn/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/zh-cn/ERR_GATEWAY_FAILURE
-#usr/lib/squid/errors/zh-cn/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/zh-cn/ERR_INVALID_REQ
-#usr/lib/squid/errors/zh-cn/ERR_INVALID_RESP
-#usr/lib/squid/errors/zh-cn/ERR_INVALID_URL
-#usr/lib/squid/errors/zh-cn/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/zh-cn/ERR_NO_RELAY
-#usr/lib/squid/errors/zh-cn/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/zh-cn/ERR_PRECONDITION_FAILED
-#usr/lib/squid/errors/zh-cn/ERR_READ_ERROR
-#usr/lib/squid/errors/zh-cn/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/zh-cn/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/zh-cn/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/zh-cn/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/zh-cn/ERR_TOO_BIG
-#usr/lib/squid/errors/zh-cn/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/zh-cn/ERR_UNSUP_REQ
-#usr/lib/squid/errors/zh-cn/ERR_URN_RESOLVE
-#usr/lib/squid/errors/zh-cn/ERR_WRITE_ERROR
-#usr/lib/squid/errors/zh-cn/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/zh-cn/error-details.txt
+#usr/lib/squid/errors/zh-hans
+#usr/lib/squid/errors/zh-hans-cn
+#usr/lib/squid/errors/zh-hans-sg
+#usr/lib/squid/errors/zh-hans/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hans/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-hans/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-hans/ERR_AGENT_WPAD
+#usr/lib/squid/errors/zh-hans/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hans/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hans/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-hans/ERR_CONFLICT_HOST
+#usr/lib/squid/errors/zh-hans/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/zh-hans/ERR_DIR_LISTING
+#usr/lib/squid/errors/zh-hans/ERR_DNS_FAIL
+#usr/lib/squid/errors/zh-hans/ERR_ESI
+#usr/lib/squid/errors/zh-hans/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/zh-hans/ERR_FTP_DISABLED
+#usr/lib/squid/errors/zh-hans/ERR_FTP_FAILURE
+#usr/lib/squid/errors/zh-hans/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/zh-hans/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/zh-hans/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/zh-hans/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/zh-hans/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/zh-hans/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/zh-hans/ERR_INVALID_REQ
+#usr/lib/squid/errors/zh-hans/ERR_INVALID_RESP
+#usr/lib/squid/errors/zh-hans/ERR_INVALID_URL
+#usr/lib/squid/errors/zh-hans/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/zh-hans/ERR_NO_RELAY
+#usr/lib/squid/errors/zh-hans/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-hans/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/zh-hans/ERR_READ_ERROR
+#usr/lib/squid/errors/zh-hans/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/zh-hans/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/zh-hans/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/zh-hans/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/zh-hans/ERR_TOO_BIG
+#usr/lib/squid/errors/zh-hans/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/zh-hans/ERR_UNSUP_REQ
+#usr/lib/squid/errors/zh-hans/ERR_URN_RESOLVE
+#usr/lib/squid/errors/zh-hans/ERR_WRITE_ERROR
+#usr/lib/squid/errors/zh-hans/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-hans/error-details.txt
+#usr/lib/squid/errors/zh-hant
+#usr/lib/squid/errors/zh-hant-hk
+#usr/lib/squid/errors/zh-hant-mo
+#usr/lib/squid/errors/zh-hant-tw
+#usr/lib/squid/errors/zh-hant/ERR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hant/ERR_ACL_TIME_QUOTA_EXCEEDED
+#usr/lib/squid/errors/zh-hant/ERR_AGENT_CONFIGURE
+#usr/lib/squid/errors/zh-hant/ERR_AGENT_WPAD
+#usr/lib/squid/errors/zh-hant/ERR_CACHE_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hant/ERR_CACHE_MGR_ACCESS_DENIED
+#usr/lib/squid/errors/zh-hant/ERR_CANNOT_FORWARD
+#usr/lib/squid/errors/zh-hant/ERR_CONFLICT_HOST
+#usr/lib/squid/errors/zh-hant/ERR_CONNECT_FAIL
+#usr/lib/squid/errors/zh-hant/ERR_DIR_LISTING
+#usr/lib/squid/errors/zh-hant/ERR_DNS_FAIL
+#usr/lib/squid/errors/zh-hant/ERR_ESI
+#usr/lib/squid/errors/zh-hant/ERR_FORWARDING_DENIED
+#usr/lib/squid/errors/zh-hant/ERR_FTP_DISABLED
+#usr/lib/squid/errors/zh-hant/ERR_FTP_FAILURE
+#usr/lib/squid/errors/zh-hant/ERR_FTP_FORBIDDEN
+#usr/lib/squid/errors/zh-hant/ERR_FTP_NOT_FOUND
+#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_CREATED
+#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_ERROR
+#usr/lib/squid/errors/zh-hant/ERR_FTP_PUT_MODIFIED
+#usr/lib/squid/errors/zh-hant/ERR_FTP_UNAVAILABLE
+#usr/lib/squid/errors/zh-hant/ERR_GATEWAY_FAILURE
+#usr/lib/squid/errors/zh-hant/ERR_ICAP_FAILURE
+#usr/lib/squid/errors/zh-hant/ERR_INVALID_REQ
+#usr/lib/squid/errors/zh-hant/ERR_INVALID_RESP
+#usr/lib/squid/errors/zh-hant/ERR_INVALID_URL
+#usr/lib/squid/errors/zh-hant/ERR_LIFETIME_EXP
+#usr/lib/squid/errors/zh-hant/ERR_NO_RELAY
+#usr/lib/squid/errors/zh-hant/ERR_ONLY_IF_CACHED_MISS
+#usr/lib/squid/errors/zh-hant/ERR_PRECONDITION_FAILED
+#usr/lib/squid/errors/zh-hant/ERR_READ_ERROR
+#usr/lib/squid/errors/zh-hant/ERR_READ_TIMEOUT
+#usr/lib/squid/errors/zh-hant/ERR_SECURE_CONNECT_FAIL
+#usr/lib/squid/errors/zh-hant/ERR_SHUTTING_DOWN
+#usr/lib/squid/errors/zh-hant/ERR_SOCKET_FAILURE
+#usr/lib/squid/errors/zh-hant/ERR_TOO_BIG
+#usr/lib/squid/errors/zh-hant/ERR_UNSUP_HTTPVERSION
+#usr/lib/squid/errors/zh-hant/ERR_UNSUP_REQ
+#usr/lib/squid/errors/zh-hant/ERR_URN_RESOLVE
+#usr/lib/squid/errors/zh-hant/ERR_WRITE_ERROR
+#usr/lib/squid/errors/zh-hant/ERR_ZERO_SIZE_OBJECT
+#usr/lib/squid/errors/zh-hant/error-details.txt
#usr/lib/squid/errors/zh-hk
#usr/lib/squid/errors/zh-mo
#usr/lib/squid/errors/zh-sg
#usr/lib/squid/errors/zh-tw
-#usr/lib/squid/errors/zh-tw/ERR_ACCESS_DENIED
-#usr/lib/squid/errors/zh-tw/ERR_ACL_TIME_QUOTA_EXCEEDED
-#usr/lib/squid/errors/zh-tw/ERR_AGENT_CONFIGURE
-#usr/lib/squid/errors/zh-tw/ERR_AGENT_WPAD
-#usr/lib/squid/errors/zh-tw/ERR_CACHE_ACCESS_DENIED
-#usr/lib/squid/errors/zh-tw/ERR_CACHE_MGR_ACCESS_DENIED
-#usr/lib/squid/errors/zh-tw/ERR_CANNOT_FORWARD
-#usr/lib/squid/errors/zh-tw/ERR_CONFLICT_HOST
-#usr/lib/squid/errors/zh-tw/ERR_CONNECT_FAIL
-#usr/lib/squid/errors/zh-tw/ERR_DIR_LISTING
-#usr/lib/squid/errors/zh-tw/ERR_DNS_FAIL
-#usr/lib/squid/errors/zh-tw/ERR_ESI
-#usr/lib/squid/errors/zh-tw/ERR_FORWARDING_DENIED
-#usr/lib/squid/errors/zh-tw/ERR_FTP_DISABLED
-#usr/lib/squid/errors/zh-tw/ERR_FTP_FAILURE
-#usr/lib/squid/errors/zh-tw/ERR_FTP_FORBIDDEN
-#usr/lib/squid/errors/zh-tw/ERR_FTP_NOT_FOUND
-#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_CREATED
-#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_ERROR
-#usr/lib/squid/errors/zh-tw/ERR_FTP_PUT_MODIFIED
-#usr/lib/squid/errors/zh-tw/ERR_FTP_UNAVAILABLE
-#usr/lib/squid/errors/zh-tw/ERR_GATEWAY_FAILURE
-#usr/lib/squid/errors/zh-tw/ERR_ICAP_FAILURE
-#usr/lib/squid/errors/zh-tw/ERR_INVALID_REQ
-#usr/lib/squid/errors/zh-tw/ERR_INVALID_RESP
-#usr/lib/squid/errors/zh-tw/ERR_INVALID_URL
-#usr/lib/squid/errors/zh-tw/ERR_LIFETIME_EXP
-#usr/lib/squid/errors/zh-tw/ERR_NO_RELAY
-#usr/lib/squid/errors/zh-tw/ERR_ONLY_IF_CACHED_MISS
-#usr/lib/squid/errors/zh-tw/ERR_PRECONDITION_FAILED
-#usr/lib/squid/errors/zh-tw/ERR_READ_ERROR
-#usr/lib/squid/errors/zh-tw/ERR_READ_TIMEOUT
-#usr/lib/squid/errors/zh-tw/ERR_SECURE_CONNECT_FAIL
-#usr/lib/squid/errors/zh-tw/ERR_SHUTTING_DOWN
-#usr/lib/squid/errors/zh-tw/ERR_SOCKET_FAILURE
-#usr/lib/squid/errors/zh-tw/ERR_TOO_BIG
-#usr/lib/squid/errors/zh-tw/ERR_UNSUP_HTTPVERSION
-#usr/lib/squid/errors/zh-tw/ERR_UNSUP_REQ
-#usr/lib/squid/errors/zh-tw/ERR_URN_RESOLVE
-#usr/lib/squid/errors/zh-tw/ERR_WRITE_ERROR
-#usr/lib/squid/errors/zh-tw/ERR_ZERO_SIZE_OBJECT
-#usr/lib/squid/errors/zh-tw/error-details.txt
+usr/lib/squid/ext_delayer_acl
usr/lib/squid/ext_edirectory_userip_acl
usr/lib/squid/ext_file_userip_acl
-usr/lib/squid/ext_kerberos_ldap_group_acl
usr/lib/squid/ext_ldap_group_acl
usr/lib/squid/ext_session_acl
usr/lib/squid/ext_sql_session_acl
#usr/share/man/man8/basic_db_auth.8
#usr/share/man/man8/basic_getpwnam_auth.8
#usr/share/man/man8/basic_ldap_auth.8
+#usr/share/man/man8/basic_msnt_multi_domain_auth.8
#usr/share/man/man8/basic_ncsa_auth.8
#usr/share/man/man8/basic_pam_auth.8
+#usr/share/man/man8/basic_pop3_auth.8
#usr/share/man/man8/basic_radius_auth.8
#usr/share/man/man8/basic_sasl_auth.8
#usr/share/man/man8/cachemgr.cgi.8
#usr/share/man/man8/digest_file_auth.8
+#usr/share/man/man8/ext_delayer_acl.8
#usr/share/man/man8/ext_edirectory_userip_acl.8
#usr/share/man/man8/ext_file_userip_acl.8
#usr/share/man/man8/ext_ldap_group_acl.8
#usr/share/man/man8/ext_unix_group_acl.8
#usr/share/man/man8/ext_wbinfo_group_acl.8
#usr/share/man/man8/log_db_daemon.8
-#usr/share/man/man8/negotiate_kerberos_auth.8
#usr/share/man/man8/squid.8
#usr/share/man/man8/storeid_file_rewrite.8
#var/cache/squid
etc/profile.d/umask.sh
etc/resolv.conf
etc/securetty
-etc/sysconfig/ramdisk
etc/sysctl.conf
etc/syslog.conf
etc/system-release
#usr/share/zoneinfo/Asia/Bahrain
#usr/share/zoneinfo/Asia/Baku
#usr/share/zoneinfo/Asia/Bangkok
+#usr/share/zoneinfo/Asia/Barnaul
#usr/share/zoneinfo/Asia/Beirut
#usr/share/zoneinfo/Asia/Bishkek
#usr/share/zoneinfo/Asia/Brunei
#usr/share/zoneinfo/Asia/Thimbu
#usr/share/zoneinfo/Asia/Thimphu
#usr/share/zoneinfo/Asia/Tokyo
+#usr/share/zoneinfo/Asia/Tomsk
#usr/share/zoneinfo/Asia/Ujung_Pandang
#usr/share/zoneinfo/Asia/Ulaanbaatar
#usr/share/zoneinfo/Asia/Ulan_Bator
#usr/share/zoneinfo/Europe
#usr/share/zoneinfo/Europe/Amsterdam
#usr/share/zoneinfo/Europe/Andorra
+#usr/share/zoneinfo/Europe/Astrakhan
#usr/share/zoneinfo/Europe/Athens
#usr/share/zoneinfo/Europe/Belfast
#usr/share/zoneinfo/Europe/Belgrade
#usr/share/zoneinfo/Europe/Jersey
#usr/share/zoneinfo/Europe/Kaliningrad
#usr/share/zoneinfo/Europe/Kiev
+#usr/share/zoneinfo/Europe/Kirov
#usr/share/zoneinfo/Europe/Lisbon
#usr/share/zoneinfo/Europe/Ljubljana
#usr/share/zoneinfo/Europe/London
#usr/share/zoneinfo/Europe/Tallinn
#usr/share/zoneinfo/Europe/Tirane
#usr/share/zoneinfo/Europe/Tiraspol
+#usr/share/zoneinfo/Europe/Ulyanovsk
#usr/share/zoneinfo/Europe/Uzhgorod
#usr/share/zoneinfo/Europe/Vaduz
#usr/share/zoneinfo/Europe/Vatican
#usr/share/zoneinfo/posix/Asia/Bahrain
#usr/share/zoneinfo/posix/Asia/Baku
#usr/share/zoneinfo/posix/Asia/Bangkok
+#usr/share/zoneinfo/posix/Asia/Barnaul
#usr/share/zoneinfo/posix/Asia/Beirut
#usr/share/zoneinfo/posix/Asia/Bishkek
#usr/share/zoneinfo/posix/Asia/Brunei
#usr/share/zoneinfo/posix/Asia/Thimbu
#usr/share/zoneinfo/posix/Asia/Thimphu
#usr/share/zoneinfo/posix/Asia/Tokyo
+#usr/share/zoneinfo/posix/Asia/Tomsk
#usr/share/zoneinfo/posix/Asia/Ujung_Pandang
#usr/share/zoneinfo/posix/Asia/Ulaanbaatar
#usr/share/zoneinfo/posix/Asia/Ulan_Bator
#usr/share/zoneinfo/posix/Europe
#usr/share/zoneinfo/posix/Europe/Amsterdam
#usr/share/zoneinfo/posix/Europe/Andorra
+#usr/share/zoneinfo/posix/Europe/Astrakhan
#usr/share/zoneinfo/posix/Europe/Athens
#usr/share/zoneinfo/posix/Europe/Belfast
#usr/share/zoneinfo/posix/Europe/Belgrade
#usr/share/zoneinfo/posix/Europe/Jersey
#usr/share/zoneinfo/posix/Europe/Kaliningrad
#usr/share/zoneinfo/posix/Europe/Kiev
+#usr/share/zoneinfo/posix/Europe/Kirov
#usr/share/zoneinfo/posix/Europe/Lisbon
#usr/share/zoneinfo/posix/Europe/Ljubljana
#usr/share/zoneinfo/posix/Europe/London
#usr/share/zoneinfo/posix/Europe/Tallinn
#usr/share/zoneinfo/posix/Europe/Tirane
#usr/share/zoneinfo/posix/Europe/Tiraspol
+#usr/share/zoneinfo/posix/Europe/Ulyanovsk
#usr/share/zoneinfo/posix/Europe/Uzhgorod
#usr/share/zoneinfo/posix/Europe/Vaduz
#usr/share/zoneinfo/posix/Europe/Vatican
#usr/share/zoneinfo/right/Asia/Bahrain
#usr/share/zoneinfo/right/Asia/Baku
#usr/share/zoneinfo/right/Asia/Bangkok
+#usr/share/zoneinfo/right/Asia/Barnaul
#usr/share/zoneinfo/right/Asia/Beirut
#usr/share/zoneinfo/right/Asia/Bishkek
#usr/share/zoneinfo/right/Asia/Brunei
#usr/share/zoneinfo/right/Asia/Thimbu
#usr/share/zoneinfo/right/Asia/Thimphu
#usr/share/zoneinfo/right/Asia/Tokyo
+#usr/share/zoneinfo/right/Asia/Tomsk
#usr/share/zoneinfo/right/Asia/Ujung_Pandang
#usr/share/zoneinfo/right/Asia/Ulaanbaatar
#usr/share/zoneinfo/right/Asia/Ulan_Bator
#usr/share/zoneinfo/right/Europe
#usr/share/zoneinfo/right/Europe/Amsterdam
#usr/share/zoneinfo/right/Europe/Andorra
+#usr/share/zoneinfo/right/Europe/Astrakhan
#usr/share/zoneinfo/right/Europe/Athens
#usr/share/zoneinfo/right/Europe/Belfast
#usr/share/zoneinfo/right/Europe/Belgrade
#usr/share/zoneinfo/right/Europe/Jersey
#usr/share/zoneinfo/right/Europe/Kaliningrad
#usr/share/zoneinfo/right/Europe/Kiev
+#usr/share/zoneinfo/right/Europe/Kirov
#usr/share/zoneinfo/right/Europe/Lisbon
#usr/share/zoneinfo/right/Europe/Ljubljana
#usr/share/zoneinfo/right/Europe/London
#usr/share/zoneinfo/right/Europe/Tallinn
#usr/share/zoneinfo/right/Europe/Tirane
#usr/share/zoneinfo/right/Europe/Tiraspol
+#usr/share/zoneinfo/right/Europe/Ulyanovsk
#usr/share/zoneinfo/right/Europe/Uzhgorod
#usr/share/zoneinfo/right/Europe/Vaduz
#usr/share/zoneinfo/right/Europe/Vatican
etc/rc.d/init.d/rc
etc/rc.d/init.d/reboot
etc/rc.d/init.d/rngd
+#etc/rc.d/init.d/rtpproxy
#etc/rc.d/init.d/samba
#etc/rc.d/init.d/sane
etc/rc.d/init.d/sendsignals
etc/modprobe.d
etc/modprobe.d/btmrvl_sdio.conf
etc/modprobe.d/cfg80211.conf
+etc/modprobe.d/nf_conntrack.conf
etc/modprobe.d/pcspeaker.conf
etc/modules.conf
etc/mtab
sbin/mount.nfs
sbin/mount.nfs4
+sbin/nfsdcltrack
sbin/osd_login
sbin/umount.nfs
sbin/umount.nfs4
#usr/lib/pkgconfig/libnfsidmap.pc
usr/sbin/exportfs
usr/sbin/mountstats
-usr/sbin/nfsdcltrack
usr/sbin/nfsiostat
usr/sbin/nfsstat
usr/sbin/rpc.idmapd
#usr/share/man/man5/exports.5
#usr/share/man/man5/idmapd.conf.5
#usr/share/man/man5/nfs.5
+#usr/share/man/man5/nfsmount.conf.5
#usr/share/man/man7/nfsd.7
#usr/share/man/man8/exportfs.8
#usr/share/man/man8/idmapd.8
var/lib/nfs/etab
var/lib/nfs/rmtab
var/lib/nfs/sm
-#var/lib/nfs/sm.bak
+var/lib/nfs/sm.bak
var/lib/nfs/state
var/lib/nfs/xtab
etc/rc.d/init.d/nfs-server
--- /dev/null
+etc/rc.d/init.d/rtpproxy
+usr/bin/makeann
+usr/bin/rtpproxy
+#usr/bin/rtpproxy_debug
+#usr/share/man/man8/rtpproxy.8
include Config
-VER = 7.43.0
+VER = 7.48.0
THISAPP = curl-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3037f0b6ce03d434618e9db5506ae6be
+$(DL_FILE)_MD5 = d42e0fc34a5cace5739631cc040974fe
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-nls
+ EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@$(PREBUILD)
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch
- cd $(DIR_APP) && ./configure --prefix=/tools --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
+ cd $(DIR_APP) && ./configure --prefix=/tools --host=$(BUILDTARGET) --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make SCRIPTS="" install
@rm -rf $(DIR_APP) $(DIR_SRC)/tcl*
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2010 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-nls
+ EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-nls
+ EXTRA_CONFIG = --prefix=/tools --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
EXTRA_INSTALL =
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
- EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls
+ EXTRA_CONFIG = --prefix=/tools --disable-shared --disable-nls --build=$(BUILDTARGET)
EXTRA_MAKE =
EXTRA_INSTALL =
endif
include Config
-VER = 2.23
+VER = 2.24
THISAPP = grep-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f46aa9d0d2577b9212a104348a286787
+$(DL_FILE)_MD5 = f1c980134c04692a90078e87283074b6
install : $(TARGET)
include Config
-VER = 2.4
+VER = 2.5
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 35
+PAK_VER = 36
DEPS = ""
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 04578f3f2c3eb1bec1adf30473813912
+$(DL_FILE)_MD5 = 69f9cec3f76d74f402864a43e4f8624f
install : $(TARGET)
include Config
-VER = 443
+VER = 481
THISAPP = less-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 47db098fb3cdaf847b3c4be05ee954fc
+$(DL_FILE)_MD5 = 50ef46065c65257141a7340123527767
install : $(TARGET)
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
else
TARGET = $(DIR_INFO)/$(THISAPP)-tools
PREFIX = /tools
+ EXTRA_CONFIG = --build=$(BUILDTARGET)
endif
EXTRA_CONFIG += \
include Config
-VER = 1.2.7
+VER = 1.3.3
THISAPP = nfs-utils-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs
-PAK_VER = 6
+PAK_VER = 7
DEPS = "portmap"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = 3b5ca797197765dc0c3a4122720c7716
+$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
install : $(TARGET)
--disable-gss \
--disable-tirpc \
--disable-nfsv41 \
- --without-tcp-wrappers
+ --without-tcp-wrappers --disable-ipv6
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2015 IPFire Team <info@ipfire.org> #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.0.0
+
+THISAPP = rtpproxy-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = rtpproxy
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8d36fcc1dd93994ac5376d145f19ac73
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 61
+PAK_VER = 62
DEPS = "cups krb5"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2118-v3-6.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2015-5370-v3-6.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
+
cd $(DIR_APP)/source3 && ./autogen.sh
cd $(DIR_APP)/source3 && ./configure \
--prefix=/usr \
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
include Config
-VER = 1.07
+VER = 1.10
THISAPP = sdparm-$(VER)
DL_FILE = $(THISAPP).tgz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c807f9db3dd7af175214be0d7fece494
+$(DL_FILE)_MD5 = bdae64375376ce8fe4bf9521c1db858f
install : $(TARGET)
include Config
-VER = 3.4.14
+VER = 3.5.17
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4e7d7d062159484563ef11f69a0df50a
+$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13228.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4.14-fix-max-file-descriptors.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13230.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13231.patch
- cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.4-13232.patch
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
+
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
--mandir=/usr/share/man \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
- --disable-ipv6 \
--disable-ssl \
- --enable-poll \
--disable-icmp \
--disable-wccp \
+ --disable-wccpv2 \
+ --disable-kqueue \
+ --disable-esi \
+ --disable-arch-native \
+ --disable-ipv6 \
+ --enable-poll \
--enable-ident-lookups \
--enable-storeio="aufs,diskd,ufs" \
--enable-underscores \
--enable-url-rewrite-helpers \
--enable-build-info \
--enable-eui \
- --with-pthreads \
- --with-dl \
- --with-filedescriptors=$$(( 16384 * 64 )) \
- --with-large-files \
- --with-aio \
- --enable-async-io=8 \
+ --enable-async-io=16 \
--enable-unlinkd \
--enable-internal-dns \
--enable-epoll \
- --disable-kqueue \
--enable-select \
--enable-cache-digests \
--enable-forw-via-db \
--enable-htcp \
--enable-kill-parent-hack \
- --disable-wccpv2 \
--enable-icap-client \
- --disable-esi \
--enable-zph-qos \
- --disable-arch-native
+ --with-pthreads \
+ --with-dl \
+ --with-filedescriptors=$$(( 16384 * 64 )) \
+ --with-large-files \
+ --with-aio
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
include Config
-VER = 2016a
+VER = 2016d
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = 0d3123eb1b453ec0620822bd65be4c42
-tzcode$(TZCODE_VER).tar.gz_MD5 = f5e0299925631da7cf82d8ce1205111d
+tzdata$(TZDATA_VER).tar.gz_MD5 = 14bf84b6c2cdab0a9428991e0150ebe6
+tzcode$(TZCODE_VER).tar.gz_MD5 = 06fc6fc111cd8dd681abdc5326529afd
install : $(TARGET)
include Config
-VER = 2.4
+VER = 2.5
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f0037dbe03897dcaf2ad2722e659095d
+$(DL_FILE)_MD5 = 96ff75c3a514f1f324560a2376f13110
install : $(TARGET)
;;
# ARM
- armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
+ armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l|armv5tel:aarch64)
# These are working.
;;
armv5tel:*)
ipfiremake bird
ipfiremake dmidecode
ipfiremake mcelog
+ ipfiremake rtpproxy
}
buildinstaller() {
case "$1" in
start)
+ boot_mesg "Mounting nfsd virtual filesystem..."
+ /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
+ evaluate_retval
+
boot_mesg "Starting NFS mountd..."
loadproc /usr/sbin/rpc.mountd
loadproc /usr/sbin/rpc.rquotad
fi
- boot_mesg "Mounting nfsd virtual filesystem..."
- /bin/mount -t nfsd none /proc/fs/nfsd 2>&1 > /dev/null
- evaluate_retval
-
# Make ceratin that the list is refreshed on
# a restart.
boot_mesg "Exporting NFS Filesystems..."
killproc /usr/sbin/rpc.statd
boot_mesg "Stopping NFS nfsd..."
- # nfsd needs HUP....
- killproc nfsd HUP
+ /usr/sbin/rpc.nfsd 0
+ evaluate_retval
boot_mesg "Stopping NFS mountd..."
killproc /usr/sbin/rpc.mountd
--- /dev/null
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/rtpproxy
+#
+# Description :
+#
+# Authors :
+#
+# Version : 00.00
+#
+# Notes :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
+
+PORT_MIN=10000
+PORT_MAX=10100
+SOCKET="/var/run/rtpproxy.sock"
+LISTEN="${GREEN_ADDRESS}"
+CUSTOM_ARGS=""
+
+PIDFILE="/var/run/rtpproxy.pid"
+
+if [ -r "/etc/sysconfig/rtpproxy" ]; then
+ . /etc/sysconfig/rtpproxy
+fi
+
+case "${1}" in
+ start)
+ boot_mesg "Starting rtpproxy..."
+ loadproc /usr/bin/rtpproxy -u nobody -p ${PIDFILE} \
+ -m ${PORT_MIN} -M ${PORT_MAX} -s ${SOCKET} \
+ -l ${LISTEN} ${CUSTOM_ARGS}
+ ;;
+
+ stop)
+ boot_mesg "Stopping rtpproxy..."
+ killproc /usr/bin/rtpproxy
+ ;;
+
+ reload)
+ boot_mesg "Reloading rtpproxy..."
+ reloadproc /usr/bin/rtpproxy
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ statusproc /usr/bin/rtpproxy
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/rtpproxy
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# Copyright (C) 2007-2017 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
+mv /usr/share/clamav /usr/share/clamav-update
./uninstall.sh
+mv /usr/share/clamav-update /usr/share/clamav
./install.sh
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+start_service ${NAME}
+ln -svf ../init.d/rtpproxy /etc/rc.d/rc0.d/K00rtpproxy
+ln -svf ../init.d/rtpproxy /etc/rc.d/rc3.d/S99rtpproxy
+ln -svf ../init.d/rtpproxy /etc/rc.d/rc6.d/K00rtpproxy
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+remove_files
+rm -rf /etc/rc.d/rc*.d/*rtpproxy
--- /dev/null
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--- /dev/null
+From 82fa625540abf8b8ec23d43c41e2ca906a9928a5 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 15 Apr 2016 11:56:08 +0200
+Subject: [PATCH] s3:rpc_server: Fix a regression verifying the security
+ trailer
+
+We do not support header signing so we should not check verify it if a
+client sends the flag.
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Guenther Deschner <gd@samba.org>
+---
+ source3/rpc_server/srv_pipe.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
+index d659705..fa354a6 100644
+--- a/source3/rpc_server/srv_pipe.c
++++ b/source3/rpc_server/srv_pipe.c
+@@ -1552,7 +1552,6 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
+ {
+ TALLOC_CTX *frame = talloc_stackframe();
+ struct dcerpc_sec_verification_trailer *vt = NULL;
+- const uint32_t bitmask1 = 0;
+ const struct dcerpc_sec_vt_pcontext pcontext = {
+ .abstract_syntax = pipe_fns->syntax,
+ .transfer_syntax = ndr_transfer_syntax,
+@@ -1573,7 +1572,7 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
+ goto done;
+ }
+
+- ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
++ ret = dcerpc_sec_verification_trailer_check(vt, NULL,
+ &pcontext, &header2);
+ done:
+ TALLOC_FREE(frame);
+--
+1.9.1
+
--- /dev/null
+From 0abef6992dc342d443137f8a2ac6c01f490cecee Mon Sep 17 00:00:00 2001
+From: Christian Ambach <ambi@samba.org>
+Date: Wed, 20 Feb 2013 16:59:05 +0100
+Subject: [PATCH] s3:rpc_client fix a crash
+
+state->cli->dc does not have to be set (e.g. when running
+net rpc join against an older Samba PDC), so check it before dereferencing it
+
+This fixes Bug 9669 - net rpc join crashes against a Samba 3.0.33 PDC
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=9669
+
+Signed-off-by: Christian Ambach <ambi@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Christian Ambach <ambi@samba.org>
+Autobuild-Date(master): Wed Feb 20 19:00:52 CET 2013 on sn-devel-104
+(cherry picked from commit 3d29bb2d37b02909ecb500e864f3c13e06957a86)
+
+(cherry picked from commit ff658bb36c28c9db91fc80a68725e893ffe300aa)
+---
+ source3/rpc_client/cli_pipe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index 5ddabb7..a211d92 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2136,7 +2136,7 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
+ status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
+ TALLOC_FREE(subreq);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
+- if (state->cli->dc->negotiate_flags &
++ if (state->cli->dc && state->cli->dc->negotiate_flags &
+ NETLOGON_NEG_SUPPORTS_AES) {
+ DEBUG(5, ("AES is not supported and the error was %s\n",
+ nt_errstr(status)));
+--
+1.9.1
+
--- /dev/null
+From 2d0424e7bb2c30bf9049529b207c73b55370dfc8 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Tue, 10 Jan 2012 16:38:16 +0100
+Subject: [PATCH] s3-rpc_client: Fix updating netlogon credentials.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Günther Deschner <gd@samba.org>
+(cherry picked from commit 33206b1e240e55acedad606aed4f1952f7496b35)
+---
+ source3/rpc_client/cli_pipe.c | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
+index a211d92..92ca494 100644
+--- a/source3/rpc_client/cli_pipe.c
++++ b/source3/rpc_client/cli_pipe.c
+@@ -2128,9 +2128,6 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
+ struct rpc_pipe_bind_state *state =
+ tevent_req_data(req,
+ struct rpc_pipe_bind_state);
+- struct schannel_state *schannel_auth =
+- talloc_get_type_abort(state->cli->auth->auth_ctx,
+- struct schannel_state);
+ NTSTATUS status;
+
+ status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
+@@ -2188,8 +2185,8 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
+ return;
+ }
+
+- TALLOC_FREE(schannel_auth->creds);
+- schannel_auth->creds = talloc_steal(state->cli, state->creds);
++ TALLOC_FREE(state->cli->dc);
++ state->cli->dc = talloc_steal(state->cli, state->creds);
+
+ if (!NT_STATUS_IS_OK(state->r.out.result)) {
+ DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
+@@ -3385,10 +3382,12 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
+ * The credentials on a new netlogon pipe are the ones we are passed
+ * in - copy them over
+ */
+- result->dc = netlogon_creds_copy(result, *pdc);
+ if (result->dc == NULL) {
+- TALLOC_FREE(result);
+- return NT_STATUS_NO_MEMORY;
++ result->dc = netlogon_creds_copy(result, *pdc);
++ if (result->dc == NULL) {
++ TALLOC_FREE(result);
++ return NT_STATUS_NO_MEMORY;
++ }
+ }
+
+ DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
+--
+1.9.1
+
+++ /dev/null
-------------------------------------------------------------
-revno: 13228
-revision-id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg
-parent: squid3@treenet.co.nz-20150801072237-5tzh2dczozz1e8sq
-fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=3696
-committer: Amos Jeffries <squid3@treenet.co.nz>
-branch nick: 3.4
-timestamp: Fri 2015-08-28 06:23:34 -0700
-message:
- Bug 3696: crash when client delay pools are activated
-------------------------------------------------------------
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: squid3@treenet.co.nz-20150828132334-3r7v4kh1lrqprrqg
-# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# testament_sha1: d193928c4656282187f2a31bf66d43fd4c247177
-# timestamp: 2015-08-28 13:33:44 +0000
-# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# base_revision_id: squid3@treenet.co.nz-20150801072237-\
-# 5tzh2dczozz1e8sq
-#
-# Begin patch
-=== modified file 'src/client_side.cc'
---- src/client_side.cc 2014-06-21 04:24:37 +0000
-+++ src/client_side.cc 2015-08-28 13:23:34 +0000
-@@ -3447,7 +3447,8 @@
-
- /* pools require explicit 'allow' to assign a client into them */
- if (pools[pool].access) {
-- ch.accessList = pools[pool].access;
-+ cbdataReferenceDone(ch.accessList);
-+ ch.accessList = cbdataReference(pools[pool].access);
- allow_t answer = ch.fastCheck();
- if (answer == ACCESS_ALLOWED) {
-
-
+++ /dev/null
-------------------------------------------------------------
-revno: 13230
-revision-id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
-parent: squid3@treenet.co.nz-20151119051038-vwclso11p68sgvxc
-fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4431
-author: Marcos Mello <marcosfrm@gmail.com>
-committer: Amos Jeffries <squid3@treenet.co.nz>
-branch nick: 3.4
-timestamp: Fri 2016-02-12 17:53:16 +1300
-message:
- Bug 4431: C code is not compiled with CFLAGS
-------------------------------------------------------------
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
-# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# testament_sha1: 53c8d70db04dad826815fb86995cda7e99f1d8e2
-# timestamp: 2016-02-12 05:50:53 +0000
-# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# base_revision_id: squid3@treenet.co.nz-20151119051038-\
-# vwclso11p68sgvxc
-#
-# Begin patch
-=== modified file 'acinclude/compiler-flags.m4'
---- acinclude/compiler-flags.m4 2015-01-09 10:30:44 +0000
-+++ acinclude/compiler-flags.m4 2016-02-12 04:53:16 +0000
-@@ -36,7 +36,7 @@
- AC_CACHE_CHECK([whether compiler accepts $2],[$1],
- [{
- AC_REQUIRE([AC_PROG_CC])
-- SAVED_FLAGS="$CFLAGS"
-+ SAVED_CFLAGS="$CFLAGS"
- SAVED_CXXFLAGS="$CXXFLAGS"
- CFLAGS="$CFLAGS $2"
- CXXFLAGS="$CXXFLAGS $2"
-@@ -60,7 +60,7 @@
- AC_CACHE_CHECK([whether compiler requires $2],[$1],
- [{
- AC_REQUIRE([AC_PROG_CC])
-- SAVED_FLAGS="$CFLAGS"
-+ SAVED_CFLAGS="$CFLAGS"
- SAVED_CXXFLAGS="$CXXFLAGS"
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM($3,$4)],[$1=no],[],[$1=no])
- if test "x$1" != "xno" ; then
-
+++ /dev/null
-------------------------------------------------------------
-revno: 13231
-revision-id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
-parent: squid3@treenet.co.nz-20160212045316-zwx4r9we4gf27rx3
-fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4323
-author: Francesco Chemolli <kinkie@squid-cache.org>
-committer: Amos Jeffries <squid3@treenet.co.nz>
-branch nick: 3.4
-timestamp: Sun 2016-02-21 04:08:59 +1300
-message:
- Bug 4323: Netfilter broken cross-includes with Linux 4.2
-------------------------------------------------------------
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
-# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# testament_sha1: 10fa174d2821207d0bf89ef3013e8f4c3f99f9e3
-# timestamp: 2016-02-20 15:50:56 +0000
-# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# base_revision_id: squid3@treenet.co.nz-20160212045316-\
-# zwx4r9we4gf27rx3
-#
-# Begin patch
-=== modified file 'compat/os/linux.h'
---- compat/os/linux.h 2012-08-28 13:00:30 +0000
-+++ compat/os/linux.h 2016-02-20 15:08:59 +0000
-@@ -22,6 +22,21 @@
- #endif
-
- /*
-+ * Netfilter header madness. (see Bug 4323)
-+ *
-+ * Netfilter have a history of defining their own versions of network protocol
-+ * primitives without sufficient protection against the POSIX defines which are
-+ * aways present in Linux.
-+ *
-+ * netinet/in.h must be included before any other sys header in order to properly
-+ * activate include guards in <linux/libc-compat.h> the kernel maintainers added
-+ * to workaround it.
-+ */
-+#if HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+
-+/*
- * sys/capability.h is only needed in Linux apparently.
- *
- * HACK: LIBCAP_BROKEN Ugly glue to get around linux header madness colliding with glibc
-
+++ /dev/null
-------------------------------------------------------------
-revno: 13232
-revision-id: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
-parent: squid3@treenet.co.nz-20160220150859-3unryicod1rcx9rm
-author: Yuriy M. Kaminskiy <yumkam@gmail.com>
-committer: Amos Jeffries <squid3@treenet.co.nz>
-branch nick: 3.4
-timestamp: Thu 2016-03-31 03:14:10 +1300
-message:
- pinger: Fix buffer overflow in Icmp6::Recv
-------------------------------------------------------------
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
-# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# testament_sha1: e404755509c03ec58c0c293552a7f2a579810fd3
-# timestamp: 2016-03-30 14:51:02 +0000
-# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
-# base_revision_id: squid3@treenet.co.nz-20160220150859-\
-# 3unryicod1rcx9rm
-#
-# Begin patch
-=== modified file 'src/icmp/Icmp6.cc'
---- src/icmp/Icmp6.cc 2014-09-15 05:06:14 +0000
-+++ src/icmp/Icmp6.cc 2016-03-30 14:14:10 +0000
-@@ -277,7 +277,7 @@
- #define ip6_hops // HOPS!!! (can it be true??)
-
- ip = (struct ip6_hdr *) pkt;
-- pkt += sizeof(ip6_hdr);
-+ NP: echo size needs to +sizeof(ip6_hdr);
-
- debugs(42, DBG_CRITICAL, HERE << "ip6_nxt=" << ip->ip6_nxt <<
- ", ip6_plen=" << ip->ip6_plen <<
-@@ -288,7 +288,6 @@
- */
-
- icmp6header = (struct icmp6_hdr *) pkt;
-- pkt += sizeof(icmp6_hdr);
-
- if (icmp6header->icmp6_type != ICMP6_ECHO_REPLY) {
-
-@@ -313,7 +312,7 @@
- return;
- }
-
-- echo = (icmpEchoData *) pkt;
-+ echo = (icmpEchoData *) (pkt + sizeof(icmp6_hdr));
-
- preply.opcode = echo->opcode;
-
-
--- /dev/null
+------------------------------------------------------------
+revno: 13233
+revision-id: squid3@treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+parent: squid3@treenet.co.nz-20160330141410-t6p2dhzr8ri36fap
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 18:39:07 +1200
+message:
+ cachemgr.cgi: use dynamic MemBuf for internal content generation
+
+ Using a fixed size buffer limits how big content lines can be. Modern
+ HTTP is fast reaching the point where such limits are problematic.
+ Also fixes incorrect uses of snprintf() by removing them.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: 161e86814f6f14d74557a3fa169b37b6601c08a1
+# timestamp: 2016-04-20 06:50:57 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3@treenet.co.nz-20160330141410-\
+# t6p2dhzr8ri36fap
+#
+# Begin patch
+=== modified file 'src/tests/stub_cbdata.cc'
+--- src/tests/stub_cbdata.cc 2012-11-01 10:31:28 +0000
++++ src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000
+@@ -5,7 +5,13 @@
+ #include "tests/STUB.h"
+
+ void cbdataRegisterWithCacheManager(void) STUB
+-
++void *cbdataInternalAlloc(cbdata_type type, const char *, int sz) {
++ return xcalloc(1, sz);
++}
++void *cbdataInternalFree(void *p, const char *, int) {
++ xfree(p);
++ return nullptr;
++}
+ #if USE_CBDATA_DEBUG
+ void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)
+ void *cbdataInternalFreeDbg(void *p, const char *, int) STUB_RETVAL(NULL)
+
+=== modified file 'src/tests/stub_mem.cc'
+--- src/tests/stub_mem.cc 2012-08-29 07:29:35 +0000
++++ src/tests/stub_mem.cc 2016-04-20 06:39:07 +0000
+@@ -5,7 +5,7 @@
+ #include "squid.h"
+
+ #define STUB_API "stub_mem.cc"
+-#include "STUB.h"
++#include "tests/STUB.h"
+ #include "Mem.h"
+
+ void
+
+=== modified file 'tools/Makefile.am'
+--- tools/Makefile.am 2014-04-06 04:37:08 +0000
++++ tools/Makefile.am 2016-04-20 06:39:07 +0000
+@@ -35,15 +35,24 @@
+ stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+ cp $(top_srcdir)/src/tests/stub_debug.cc .
+
++MemBuf.cc: $(top_srcdir)/src/MemBuf.cc
++ cp $(top_srcdir)/src/MemBuf.cc $@
++
+ time.cc: $(top_srcdir)/src/time.cc
+ cp $(top_srcdir)/src/time.cc .
+
++stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
++ cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
++
++stub_mem.cc: $(top_srcdir)/src/tests/stub_mem.cc
++ cp $(top_srcdir)/src/tests/stub_mem.cc $@
++
+ # stock tools for unit tests - library independent versions of dlink_list
+ # etc.
+ # globals.cc is needed by test_tools.cc.
+ # Neither of these should be disted from here.
+ TESTSOURCES= test_tools.cc
+-CLEANFILES += test_tools.cc stub_debug.cc time.cc
++CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_mem.cc
+
+ ## ##### helper-mux #####
+
+@@ -74,7 +83,10 @@
+ libexec_PROGRAMS = cachemgr$(CGIEXT)
+
+ cachemgr__CGIEXT__SOURCES = cachemgr.cc \
++ MemBuf.cc \
++ stub_cbdata.cc \
+ stub_debug.cc \
++ stub_mem.cc \
+ test_tools.cc \
+ time.cc
+
+
+=== modified file 'tools/cachemgr.cc'
+--- tools/cachemgr.cc 2015-01-09 10:32:57 +0000
++++ tools/cachemgr.cc 2016-04-20 06:39:07 +0000
+@@ -35,6 +35,7 @@
+ #include "getfullhostname.h"
+ #include "html_quote.h"
+ #include "ip/Address.h"
++#include "MemBuf.h"
+ #include "rfc1123.h"
+ #include "rfc1738.h"
+ #include "util.h"
+@@ -460,8 +461,8 @@
+ return url;
+ }
+
+-static const char *
+-munge_menu_line(const char *buf, cachemgr_request * req)
++static void
++munge_menu_line(MemBuf &out, const char *buf, cachemgr_request * req)
+ {
+ char *x;
+ const char *a;
+@@ -469,15 +470,14 @@
+ const char *p;
+ char *a_url;
+ char *buf_copy;
+- static char html[2 * 1024];
+-
+- if (strlen(buf) < 1)
+- return buf;
+-
+- if (*buf != ' ')
+- return buf;
+-
+- buf_copy = x = xstrdup(buf);
++
++ const char bufLen = strlen(buf);
++ if (bufLen < 1 || *buf != ' ') {
++ out.append(buf, bufLen);
++ return;
++ }
++
++ buf_copy = x = xstrndup(buf, bufLen);
+
+ a = xstrtok(&x, '\t');
+
+@@ -489,59 +489,56 @@
+
+ /* no reason to give a url for a disabled action */
+ if (!strcmp(p, "disabled"))
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url);
++ out.Printf("<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url);
+ else
+ /* disable a hidden action (requires a password, but password is not in squid.conf) */
+ if (!strcmp(p, "hidden"))
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url);
++ out.Printf("<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url);
+ else
+ /* disable link if authentication is required and we have no password */
+ if (!strcmp(p, "protected") && !req->passwd)
+- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n",
+- d, menu_url(req, "authenticate"), a_url);
++ out.Printf("<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n",
++ d, menu_url(req, "authenticate"), a_url);
+ else
+ /* highlight protected but probably available entries */
+ if (!strcmp(p, "protected"))
+- snprintf(html, sizeof(html), "<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n",
+- a_url, d);
++ out.Printf("<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n",
++ a_url, d);
+
+ /* public entry or unknown type of protection */
+ else
+- snprintf(html, sizeof(html), "<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d);
++ out.Printf("<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d);
+
+ xfree(a_url);
+
+ xfree(buf_copy);
+-
+- return html;
+ }
+
+-static const char *
+-munge_other_line(const char *buf, cachemgr_request * req)
++static void
++munge_other_line(MemBuf &out, const char *buf, cachemgr_request *)
+ {
+ static const char *ttags[] = {"td", "th"};
+
+- static char html[4096];
+ static int table_line_num = 0;
+ static int next_is_header = 0;
+ int is_header = 0;
+ const char *ttag;
+ char *buf_copy;
+ char *x, *p;
+- int l = 0;
+ /* does it look like a table? */
+
+ if (!strchr(buf, '\t') || *buf == '\t') {
+ /* nope, just text */
+- snprintf(html, sizeof(html), "%s%s",
+- table_line_num ? "</table>\n<pre>" : "", html_quote(buf));
++ if (table_line_num)
++ out.append("</table>\n<pre>", 14);
++ out.Printf("%s", html_quote(buf));
+ table_line_num = 0;
+- return html;
++ return;
+ }
+
+ /* start html table */
+ if (!table_line_num) {
+- l += snprintf(html + l, sizeof(html) - l, "</pre><table cellpadding=\"2\" cellspacing=\"1\">\n");
++ out.append("</pre><table cellpadding=\"2\" cellspacing=\"1\">\n", 46);
+ next_is_header = 0;
+ }
+
+@@ -551,7 +548,7 @@
+ ttag = ttags[is_header];
+
+ /* record starts */
+- l += snprintf(html + l, sizeof(html) - l, "<tr>");
++ out.append("<tr>", 4);
+
+ /* substitute '\t' */
+ buf_copy = x = xstrdup(buf);
+@@ -568,18 +565,17 @@
+ ++x;
+ }
+
+- l += snprintf(html + l, sizeof(html) - l, "<%s colspan=\"%d\" align=\"%s\">%s</%s>",
+- ttag, column_span,
+- is_header ? "center" : is_number(cell) ? "right" : "left",
+- html_quote(cell), ttag);
++ out.Printf("<%s colspan=\"%d\" align=\"%s\">%s</%s>",
++ ttag, column_span,
++ is_header ? "center" : is_number(cell) ? "right" : "left",
++ html_quote(cell), ttag);
+ }
+
+ xfree(buf_copy);
+ /* record ends */
+- snprintf(html + l, sizeof(html) - l, "</tr>\n");
++ out.append("</tr>\n", 6);
+ next_is_header = is_header && strstr(buf, "\t\t");
+ ++table_line_num;
+- return html;
+ }
+
+ static const char *
+@@ -736,14 +732,18 @@
+ /* yes, fall through, we do not want to loose the first line */
+
+ case isBody:
++ {
+ /* interpret [and reformat] cache response */
+-
++ MemBuf out;
++ out.init();
+ if (parse_menu)
+- fputs(munge_menu_line(buf, req), stdout);
++ munge_menu_line(out, buf, req);
+ else
+- fputs(munge_other_line(buf, req), stdout);
++ munge_other_line(out, buf, req);
+
+- break;
++ fputs(out.buf, stdout);
++ }
++ break;
+
+ case isForward:
+ /* forward: no modifications allowed */
+
--- /dev/null
+------------------------------------------------------------
+revno: 13234
+revision-id: squid3@treenet.co.nz-20160420101437-36eofkldxfku61kj
+parent: squid3@treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 22:14:37 +1200
+message:
+ nullptr is a C++11 feature
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160420101437-36eofkldxfku61kj
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: 0f9f2a5b29a7ef02befe2a4e2e6357ef4bcffbce
+# timestamp: 2016-04-20 10:51:03 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3@treenet.co.nz-20160420063907-\
+# hcnf4qmcg5hbjc11
+#
+# Begin patch
+=== modified file 'src/tests/stub_cbdata.cc'
+--- src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000
++++ src/tests/stub_cbdata.cc 2016-04-20 10:14:37 +0000
+@@ -10,7 +10,7 @@
+ }
+ void *cbdataInternalFree(void *p, const char *, int) {
+ xfree(p);
+- return nullptr;
++ return NULL;
+ }
+ #if USE_CBDATA_DEBUG
+ void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)
+
--- /dev/null
+------------------------------------------------------------
+revno: 13235
+revision-id: squid3@treenet.co.nz-20160420111514-4hpxglbn9k15l5sa
+parent: squid3@treenet.co.nz-20160420101437-36eofkldxfku61kj
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.4
+timestamp: Wed 2016-04-20 23:15:14 +1200
+message:
+ Fix several ESI element construction issues
+
+ * Do not wrap active logic in assert().
+
+ * Fix localbuf array bounds checking.
+
+ * Add Must() conditions to verify array writes will succeed
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160420111514-4hpxglbn9k15l5sa
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# testament_sha1: e95687b13c98667ab09966e7f94d511ca3e6ad96
+# timestamp: 2016-04-20 11:18:22 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
+# base_revision_id: squid3@treenet.co.nz-20160420101437-\
+# 36eofkldxfku61kj
+#
+# Begin patch
+=== modified file 'src/esi/Esi.cc'
+--- src/esi/Esi.cc 2013-06-27 15:58:46 +0000
++++ src/esi/Esi.cc 2016-04-20 11:15:14 +0000
+@@ -991,7 +991,7 @@
+ ESIElement::Pointer element;
+ int specifiedattcount = attrCount * 2;
+ char *position;
+- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
++ Must(ellen < sizeof(localbuf)); /* prevent unexpected overruns. */
+
+ debugs(86, 5, "ESIContext::Start: element '" << el << "' with " << specifiedattcount << " tags");
+
+@@ -1005,15 +1005,17 @@
+ /* Spit out elements we aren't interested in */
+ localbuf[0] = '<';
+ localbuf[1] = '\0';
+- assert (xstrncpy (&localbuf[1], el, sizeof(localbuf) - 2));
++ xstrncpy(&localbuf[1], el, sizeof(localbuf) - 2);
+ position = localbuf + strlen (localbuf);
+
+ for (i = 0; i < specifiedattcount && attr[i]; i += 2) {
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = ' ';
+ ++position;
+ /* TODO: handle thisNode gracefully */
+- assert (xstrncpy (position, attr[i], sizeof(localbuf) + (position - localbuf)));
++ xstrncpy(position, attr[i], sizeof(localbuf) - (position - localbuf));
+ position += strlen (position);
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
+ *position = '=';
+ ++position;
+ *position = '\"';
+@@ -1022,18 +1024,21 @@
+ char ch;
+ while ((ch = *chPtr++) != '\0') {
+ if (ch == '\"') {
+- assert( xstrncpy(position, """, sizeof(localbuf) + (position-localbuf)) );
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 6);
++ xstrncpy(position, """, sizeof(localbuf) - (position-localbuf));
+ position += 6;
+ } else {
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = ch;
+ ++position;
+ }
+ }
+- position += strlen (position);
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+ *position = '\"';
+ ++position;
+ }
+
++ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
+ *position = '>';
+ ++position;
+ *position = '\0';
+@@ -1119,11 +1124,11 @@
+ switch (ESIElement::IdentifyElement (el)) {
+
+ case ESIElement::ESI_ELEMENT_NONE:
+- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
++ Must(ellen < sizeof(localbuf) - 3); /* prevent unexpected overruns. */
+ /* Add elements we aren't interested in */
+ localbuf[0] = '<';
+ localbuf[1] = '/';
+- assert (xstrncpy (&localbuf[2], el, sizeof(localbuf) - 3));
++ xstrncpy(&localbuf[2], el, sizeof(localbuf) - 3);
+ position = localbuf + strlen (localbuf);
+ *position = '>';
+ ++position;
+
---- configure.ac~ 2016-01-23 01:27:44.078013879 +0000
-+++ configure.ac 2016-01-23 01:28:19.422179243 +0000
-@@ -2573,6 +2573,9 @@
+--- configure.ac.~ Wed Apr 20 14:26:07 2016
++++ configure.ac Fri Apr 22 17:20:46 2016
+@@ -3131,6 +3131,9 @@
;;
esac
dnl --with-maxfd present for compatibility with Squid-2.
dnl undocumented in ./configure --help to encourage using the Squid-3 directive
AC_ARG_WITH(maxfd,,
-@@ -2603,8 +2606,6 @@
+@@ -3161,8 +3164,6 @@
esac
])
sprintf(message, _("Please choose a networkcard for the following interface - %s."), ucolourcard[colour]);
rc=2;
while ( rc == 2 ) {
- rc = newtWinMenu(_("Extended Network Menu"), message, 50, 5, 5, 6, pMenuInhalt, &choise,
+ rc = newtWinMenu(_("Extended Network Menu"), message, 50, 5, 5, mcount, pMenuInhalt, &choise,
_("Select"), _("Identify"), _("Cancel"), NULL);
if ( rc == 2 ) {
sprintf(temp, "/sbin/ip link set %s up", nics[found_NIC_as_Card[choise]].nic);
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
x86_64|i686|i586)
echo "i586"
;;
- armv7*|armv6*|armv5*)
+ aarch64|armv7*|armv6*|armv5*)
echo "armv5tel"
;;
*)
projects / ipfire-2.x.git / commitdiff
