From patchwork Thu May 20 21:25:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4346 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FmN7N6tP3z3wbb for ; Thu, 20 May 2021 21:25:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FmN7M1yMrzHv; Thu, 20 May 2021 21:25:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FmN7L6NWtz2xbg; Thu, 20 May 2021 21:25:18 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FmN7K55TQz2xVn for ; Thu, 20 May 2021 21:25:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FmN7H2WmKzJh for ; Thu, 20 May 2021 21:25:15 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1621545916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=accM9pD9bNB1EIekn6loqr8jTR0iS3baLUl8G9+3hEI=; b=C92vZ5tOe3ve0qzTRd4TjYvHQFHMR4sMYi9fNu9FnkVtkU/lfZtzrj5MVKufIFXORF0MMe J3oSQkwWvUZRg3Bg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1621545916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=accM9pD9bNB1EIekn6loqr8jTR0iS3baLUl8G9+3hEI=; b=WAy3BC95gsEERQwVIKgzHxXwYNkQX0lkzIGFQnUaTy+MbASJG3NS0LqxpXx73W4KBwnaLr 6hzXkDFBd60dlDv14UD+b89/s2FlVVdocTDrWfWQM7GKLGNPJU3POrRZ2mLPduncoxgxRk j3DxJFvUFHBpPV7ue+xklcU2q9OtBotaumxecY9BzcTTgJuoaZUMGXxX3jedqQtSTJoO2C GBLJSuc4EWYUwBDwGP4Ki6Tomip9194tkgtKqGV/GujA8/9C9I/9kYvl5RgBc2O0nzM9wJ E4XkHEmRJZ6LqUrA6VoVc7jHGNzUba989OVP2lLN/AO5mZ1aIhbPcLoZt7NZZQ== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] Clean up various files left from dropped add-ons and packages Message-ID: Date: Thu, 20 May 2021 23:25:05 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Since I only ran "find . -type f -name ...", I missed mostly directories containing configuration and initscripts of recently dropped add-ons and packages. Signed-off-by: Peter Müller --- config/asterisk/asterisk.logrotate | 9 - config/fbset/fb.modes | 85 --- config/motion/motion.conf | 637 ------------------ config/sane/saned.conf | 24 - src/paks/asterisk/install.sh | 27 - src/paks/asterisk/uninstall.sh | 29 - src/paks/asterisk/update.sh | 27 - src/paks/motion/install.sh | 29 - src/paks/motion/uninstall.sh | 26 - src/paks/motion/update.sh | 27 - src/patches/asterisk-no-ffmpeg.patch | 11 - .../asterisk-ssl-reader-should-block.patch | 28 - 12 files changed, 959 deletions(-) delete mode 100644 config/asterisk/asterisk.logrotate delete mode 100644 config/fbset/fb.modes delete mode 100644 config/motion/motion.conf delete mode 100644 config/sane/saned.conf delete mode 100644 src/paks/asterisk/install.sh delete mode 100644 src/paks/asterisk/uninstall.sh delete mode 100644 src/paks/asterisk/update.sh delete mode 100644 src/paks/motion/install.sh delete mode 100644 src/paks/motion/uninstall.sh delete mode 100644 src/paks/motion/update.sh delete mode 100644 src/patches/asterisk-no-ffmpeg.patch delete mode 100644 src/patches/asterisk-ssl-reader-should-block.patch diff --git a/config/asterisk/asterisk.logrotate b/config/asterisk/asterisk.logrotate deleted file mode 100644 index 887d04a33..000000000 --- a/config/asterisk/asterisk.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/asterisk/messages /var/log/asterisk/full /var/log/asterisk/security /var/log/asterisk/*_log { - weekly - missingok - rotate 4 - sharedscripts - postrotate - /usr/sbin/asterisk -rx 'logger reload' > /dev/null 2> /dev/null - endscript -} diff --git a/config/fbset/fb.modes b/config/fbset/fb.modes deleted file mode 100644 index 2b535299c..000000000 --- a/config/fbset/fb.modes +++ /dev/null @@ -1,85 +0,0 @@ -# -# DirectFB video modes, should be placed into "/etc" -# - -mode "640x480 75Hz 16bit" - # D: 31.50 MHz, H: 37.500 kHz, V: 75.00 Hz - geometry 640 480 640 480 16 - timings 31747 120 16 16 1 64 3 -endmode - -mode "720x576 50Hz 16bit" - geometry 720 576 720 576 16 - timings 31208 144 40 32 10 128 3 -endmode - -mode "768x576 75Hz 16bit" - # D: 49.188 MHz, H: 46.580 kHz, V: 75.008 Hz - geometry 768 576 768 576 16 - timings 20330 128 32 32 8 128 5 -endmode - - -mode "800x600 75Hz 16bit" - # D: 49.50 MHz, H: 46.875 kHz, V: 75.00 Hz - geometry 800 600 800 600 16 - timings 20203 160 16 21 1 80 3 - hsync high - vsync high -endmode - - -mode "1024x768 72Hz 16bit" - # D: 75.00 MHz, H: 58.230 kHz, V: 72.245 Hz - geometry 1024 768 1024 768 16 - timings 13334 104 24 29 3 136 6 -endmode - - -mode "1280x1024-75" - # D: 134.880 MHz, H: 79.905 kHz, V: 74.958 Hz - geometry 1280 1024 1280 3264 16 - timings 7414 232 64 38 1 112 3 - hsync high - vsync high -endmode - -mode "1280x1024 60Hz 16bit" - # D: 108.00 MHz, H: 63.981 kHz, V: 60.02 Hz - geometry 1280 1024 1280 1024 16 - timings 9260 248 48 38 1 112 3 - hsync high - vsync high -endmode - - -mode "1600x1200 60Hz 16bit" - # D: 156.00 MHz, H: 76.200 kHz, V: 60.00 Hz - geometry 1600 1200 1600 1200 16 - timings 6411 256 32 52 10 160 8 -endmode - - -mode "640x400 93Hz 16bit" - geometry 640 400 640 400 16 - timings 28272 48 32 17 22 128 12 -endmode - -mode "400x300 100Hz 16bit" - geometry 400 300 400 300 16 - timings 31747 40 16 16 1 40 3 - double true -endmode - - -mode "320x240 85Hz 16bit" - geometry 320 240 320 240 16 - timings 51383 32 32 20 4 48 1 - double true -endmode - -mode "320x200 85Hz 16bit" - geometry 320 200 320 200 16 - timings 60440 32 32 20 4 48 1 - double true -endmode diff --git a/config/motion/motion.conf b/config/motion/motion.conf deleted file mode 100644 index 0d2853ada..000000000 --- a/config/motion/motion.conf +++ /dev/null @@ -1,637 +0,0 @@ -# Rename this distribution example file to motion.conf -# -# This config file was generated by motion 3.2.11 - - -############################################################ -# Daemon -############################################################ - -# Start in daemon (background) mode and release terminal (default: off) -daemon on - -# File to store the process ID, also called pid file. (default: not defined) -process_id_file /var/run/motion.pid - -############################################################ -# Basic Setup Mode -############################################################ - -# Start in Setup-Mode, daemon disabled. (default: off) -setup_mode off - -########################################################### -# Capture device options -############################################################ - -# Videodevice to be used for capturing (default /dev/video0) -# for FreeBSD default is /dev/bktr0 -videodevice /dev/video0 - -# v4l2_palette allows to choose preferable palette to be use by motion -# to capture from those supported by your videodevice. (default: 8) -# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and -# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG. -# Setting v4l2_palette to 1 forces motion to use V4L2_PIX_FMT_SBGGR8 -# instead. -# -# Values : -# V4L2_PIX_FMT_SN9C10X : 0 'S910' -# V4L2_PIX_FMT_SBGGR8 : 1 'BA81' -# V4L2_PIX_FMT_MJPEG : 2 'MJPEG' -# V4L2_PIX_FMT_JPEG : 3 'JPEG' -# V4L2_PIX_FMT_RGB24 : 4 'RGB3' -# V4L2_PIX_FMT_UYVY : 5 'UYVY' -# V4L2_PIX_FMT_YUYV : 6 'YUYV' -# V4L2_PIX_FMT_YUV422P : 7 '422P' -# V4L2_PIX_FMT_YUV420 : 8 'YU12' -v4l2_palette 8 - -# Tuner device to be used for capturing using tuner as source (default /dev/tuner0) -# This is ONLY used for FreeBSD. Leave it commented out for Linux -; tunerdevice /dev/tuner0 - -# The video input to be used (default: 8) -# Should normally be set to 0 or 1 for video/TV cards, and 8 for USB cameras -input 8 - -# The video norm to use (only for video capture and TV tuner cards) -# Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL) -norm 0 - -# The frequency to set the tuner to (kHz) (only for TV tuner cards) (default: 0) -frequency 0 - -# Rotate image this number of degrees. The rotation affects all saved images as -# well as mpeg movies. Valid values: 0 (default = no rotation), 90, 180 and 270. -rotate 0 - -# Image width (pixels). Valid range: Camera dependent, default: 352 -width 640 - -# Image height (pixels). Valid range: Camera dependent, default: 288 -height 480 - -# Maximum number of frames to be captured per second. -# Valid range: 2-100. Default: 100 (almost no limit). -framerate 2 - -# Minimum time in seconds between capturing picture frames from the camera. -# Default: 0 = disabled - the capture rate is given by the camera framerate. -# This option is used when you want to capture images at a rate lower than 2 per second. -minimum_frame_time 0 - -# URL to use if you are using a network camera, size will be autodetected (incl http:// ftp:// or file:///) -# Must be a URL that returns single jpeg pictures or a raw mjpeg stream. Default: Not defined -; netcam_url value - -# Username and password for network camera (only if required). Default: not defined -# Syntax is user:password -; netcam_userpass value - -# The setting for keep-alive of network socket, should improve performance on compatible net cameras. -# 1.0: The historical implementation using HTTP/1.0, closing the socket after each http request. -# keep_alive: Use HTTP/1.0 requests with keep alive header to reuse the same connection. -# 1.1: Use HTTP/1.1 requests that support keep alive as default. -# Default: 1.0 -; netcam_http 1.0 - -# URL to use for a netcam proxy server, if required, e.g. "http://myproxy". -# If a port number other than 80 is needed, use "http://myproxy:1234". -# Default: not defined -; netcam_proxy value - -# Set less strict jpeg checks for network cameras with a poor/buggy firmware. -# Default: off -netcam_tolerant_check off - -# Let motion regulate the brightness of a video device (default: off). -# The auto_brightness feature uses the brightness option as its target value. -# If brightness is zero auto_brightness will adjust to average brightness value 128. -# Only recommended for cameras without auto brightness -auto_brightness on - -# Set the initial brightness of a video device. -# If auto_brightness is enabled, this value defines the average brightness level -# which Motion will try and adjust to. -# Valid range 0-255, default 0 = disabled -brightness 128 - -# Set the contrast of a video device. -# Valid range 0-255, default 0 = disabled -contrast 0 - -# Set the saturation of a video device. -# Valid range 0-255, default 0 = disabled -saturation 0 - -# Set the hue of a video device (NTSC feature). -# Valid range 0-255, default 0 = disabled -hue 0 - - -############################################################ -# Round Robin (multiple inputs on same video device name) -############################################################ - -# Number of frames to capture in each roundrobin step (default: 1) -roundrobin_frames 1 - -# Number of frames to skip before each roundrobin step (default: 1) -roundrobin_skip 1 - -# Try to filter out noise generated by roundrobin (default: off) -switchfilter off - - -############################################################ -# Motion Detection Settings: -############################################################ - -# Threshold for number of changed pixels in an image that -# triggers motion detection (default: 1500) -threshold 1500 - -# Automatically tune the threshold down if possible (default: off) -threshold_tune off - -# Noise threshold for the motion detection (default: 32) -noise_level 32 - -# Automatically tune the noise threshold (default: on) -noise_tune on - -# Despeckle motion image using (e)rode or (d)ilate or (l)abel (Default: not defined) -# Recommended value is EedDl. Any combination (and number of) of E, e, d, and D is valid. -# (l)abeling must only be used once and the 'l' must be the last letter. -# Comment out to disable -despeckle EedDl - -# Detect motion in predefined areas (1 - 9). Areas are numbered like that: 1 2 3 -# A script (on_area_detected) is started immediately when motion is 4 5 6 -# detected in one of the given areas, but only once during an event. 7 8 9 -# One or more areas can be specified with this option. (Default: not defined) -; area_detect value - -# PGM file to use as a sensitivity mask. -# Full path name to. (Default: not defined) -; mask_file value - -# Dynamically create a mask file during operation (default: 0) -# Adjust speed of mask changes from 0 (off) to 10 (fast) -smart_mask_speed 0 - -# Ignore sudden massive light intensity changes given as a percentage of the picture -# area that changed intensity. Valid range: 0 - 100 , default: 0 = disabled -lightswitch 0 - -# Picture frames must contain motion at least the specified number of frames -# in a row before they are detected as true motion. At the default of 1, all -# motion is detected. Valid range: 1 to thousands, recommended 1-5 -minimum_motion_frames 1 - -# Specifies the number of pre-captured (buffered) pictures from before motion -# was detected that will be output at motion detection. -# Recommended range: 0 to 5 (default: 0) -# Do not use large values! Large values will cause Motion to skip video frames and -# cause unsmooth mpegs. To smooth mpegs use larger values of post_capture instead. -pre_capture 5 - -# Number of frames to capture after motion is no longer detected (default: 0) -post_capture 5 - -# Gap is the seconds of no motion detection that triggers the end of an event -# An event is defined as a series of motion images taken within a short timeframe. -# Recommended value is 60 seconds (Default). The value 0 is allowed and disables -# events causing all Motion to be written to one single mpeg file and no pre_capture. -gap 0 - -# Maximum length in seconds of an mpeg movie -# When value is exceeded a new mpeg file is created. (Default: 0 = infinite) -max_mpeg_time 86400 - -# Always save images even if there was no motion (default: off) -output_all off - - -############################################################ -# Image File Output -############################################################ - -# Output 'normal' pictures when motion is detected (default: on) -# Valid values: on, off, first, best, center -# When set to 'first', only the first picture of an event is saved. -# Picture with most motion of an event is saved when set to 'best'. -# Picture with motion nearest center of picture is saved when set to 'center'. -# Can be used as preview shot for the corresponding movie. -output_normal off - -# Output pictures with only the pixels moving object (ghost images) (default: off) -output_motion off - -# The quality (in percent) to be used by the jpeg compression (default: 75) -quality 75 - -# Output ppm images instead of jpeg (default: off) -ppm off - - -############################################################ -# FFMPEG related options -# Film (mpeg) file output, and deinterlacing of the video input -# The options movie_filename and timelapse_filename are also used -# by the ffmpeg feature -############################################################ - -# Use ffmpeg to encode mpeg movies in realtime (default: off) -ffmpeg_cap_new off - -# Use ffmpeg to make movies with only the pixels moving -# object (ghost images) (default: off) -ffmpeg_cap_motion off - -# Use ffmpeg to encode a timelapse movie -# Default value 0 = off - else save frame every Nth second -ffmpeg_timelapse 0 - -# The file rollover mode of the timelapse video -# Valid values: hourly, daily (default), weekly-sunday, weekly-monday, monthly, manual -ffmpeg_timelapse_mode daily - -# Bitrate to be used by the ffmpeg encoder (default: 400000) -# This option is ignored if ffmpeg_variable_bitrate is not 0 (disabled) -ffmpeg_bps 500000 - -# Enables and defines variable bitrate for the ffmpeg encoder. -# ffmpeg_bps is ignored if variable bitrate is enabled. -# Valid values: 0 (default) = fixed bitrate defined by ffmpeg_bps, -# or the range 2 - 31 where 2 means best quality and 31 is worst. -ffmpeg_variable_bitrate 0 - -# Codec to used by ffmpeg for the video compression. -# Timelapse mpegs are always made in mpeg1 format independent from this option. -# Supported formats are: mpeg1 (ffmpeg-0.4.8 only), mpeg4 (default), and msmpeg4. -# mpeg1 - gives you files with extension .mpg -# mpeg4 or msmpeg4 - gives you files with extension .avi -# msmpeg4 is recommended for use with Windows Media Player because -# it requires no installation of codec on the Windows client. -# swf - gives you a flash film with extension .swf -# flv - gives you a flash video with extension .flv -# ffv1 - FF video codec 1 for Lossless Encoding ( experimental ) -# mov - QuickTime ( testing ) -ffmpeg_video_codec msmpeg4 - -# Use ffmpeg to deinterlace video. Necessary if you use an analog camera -# and see horizontal combing on moving objects in video or pictures. -# (default: off) -ffmpeg_deinterlace off - - -############################################################ -# Snapshots (Traditional Periodic Webcam File Output) -############################################################ - -# Make automated snapshot every N seconds (default: 0 = disabled) -snapshot_interval 0 - - -############################################################ -# Text Display -# %Y = year, %m = month, %d = date, -# %H = hour, %M = minute, %S = second, %T = HH:MM:SS, -# %v = event, %q = frame number, %t = thread (camera) number, -# %D = changed pixels, %N = noise level, \n = new line, -# %i and %J = width and height of motion area, -# %K and %L = X and Y coordinates of motion center -# %C = value defined by text_event - do not use with text_event! -# You can put quotation marks around the text to allow -# leading spaces -############################################################ - -# Locate and draw a box around the moving object. -# Valid values: on, off and preview (default: off) -# Set to 'preview' will only draw a box in preview_shot pictures. -locate off - -# Draws the timestamp using same options as C function strftime(3) -# Default: %Y-%m-%d\n%T = date in ISO format and time in 24 hour clock -# Text is placed in lower right corner -text_right %Y-%m-%d\n%T-%q - -# Draw a user defined text on the images using same options as C function strftime(3) -# Default: Not defined = no text -# Text is placed in lower left corner -text_left CAMERA %t\nhttp://www.ipfire.org - -# Draw the number of changed pixed on the images (default: off) -# Will normally be set to off except when you setup and adjust the motion settings -# Text is placed in upper right corner -text_changes off - -# This option defines the value of the special event conversion specifier %C -# You can use any conversion specifier in this option except %C. Date and time -# values are from the timestamp of the first image in the current event. -# Default: %Y%m%d%H%M%S -# The idea is that %C can be used filenames and text_left/right for creating -# a unique identifier for each event. -text_event %Y%m%d%H%M%S - -# Draw characters at twice normal size on images. (default: off) -text_double off - - -############################################################ -# Target Directories and filenames For Images And Films -# For the options snapshot_, jpeg_, mpeg_ and timelapse_filename -# you can use conversion specifiers -# %Y = year, %m = month, %d = date, -# %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, -# %D = changed pixels, %N = noise level, -# %i and %J = width and height of motion area, -# %K and %L = X and Y coordinates of motion center -# %C = value defined by text_event -# Quotation marks round string are allowed. -############################################################ - -# Target base directory for pictures and films -# Recommended to use absolute path. (Default: current working directory) -target_dir /var/motion/cam1 - -# File path for snapshots (jpeg or ppm) relative to target_dir -# Default: %v-%Y%m%d%H%M%S-snapshot -# Default value is equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-snapshot -# File extension .jpg or .ppm is automatically added so do not include this. -# Note: A symbolic link called lastsnap.jpg created in the target_dir will always -# point to the latest snapshot, unless snapshot_filename is exactly 'lastsnap' -snapshot_filename %v-%Y%m%d%H%M%S-snapshot - -# File path for motion triggered images (jpeg or ppm) relative to target_dir -# Default: %v-%Y%m%d%H%M%S-%q -# Default value is equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H/%M/%S-%q -# File extension .jpg or .ppm is automatically added so do not include this -# Set to 'preview' together with best-preview feature enables special naming -# convention for preview shots. See motion guide for details -jpeg_filename %v-%Y%m%d%H%M%S-%q - -# File path for motion triggered ffmpeg films (mpeg) relative to target_dir -# Default: %v-%Y%m%d%H%M%S -# Default value is equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S -# File extension .mpg or .avi is automatically added so do not include this -# This option was previously called ffmpeg_filename -movie_filename %v-%Y%m%d%H%M%S - -# File path for timelapse mpegs relative to target_dir -# Default: %Y%m%d-timelapse -# Default value is near equivalent to legacy oldlayout option -# For Motion 3.0 compatible mode choose: %Y/%m/%d-timelapse -# File extension .mpg is automatically added so do not include this -timelapse_filename %Y%m%d-timelapse - - -############################################################ -# Live Webcam Server -############################################################ - -# The mini-http server listens to this port for requests (default: 0 = disabled) -webcam_port 2500 - -# Quality of the jpeg images produced (default: 50) -webcam_quality 50 - -# Output frames at 1 fps when no motion is detected and increase to the -# rate given by webcam_maxrate when motion is detected (default: off) -webcam_motion off - -# Maximum framerate for webcam streams (default: 1) -webcam_maxrate 1 - -# Restrict webcam connections to localhost only (default: on) -webcam_localhost off - -# Limits the number of images per connection (default: 0 = unlimited) -# Number can be defined by multiplying actual webcam rate by desired number of seconds -# Actual webcam rate is the smallest of the numbers framerate and webcam_maxrate -webcam_limit 0 - - -############################################################ -# HTTP Based Control -############################################################ - -# TCP/IP port for the http server to listen on (default: 0 = disabled) -control_port 0 - -# Restrict control connections to localhost only (default: on) -control_localhost on - -# Output for http server, select off to choose raw text plain (default: on) -control_html_output on - -# Authentication for the http based control. Syntax username:password -# Default: not defined (Disabled) -; control_authentication username:password - - -############################################################ -# Tracking (Pan/Tilt) -############################################################ - -# Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic, 5=uvcvideo) -# The generic type enables the definition of motion center and motion size to -# be used with the conversion specifiers for options like on_motion_detected -track_type 0 - -# Enable auto tracking (default: off) -track_auto off - -# Serial port of motor (default: none) -; track_port value - -# Motor number for x-axis (default: 0) -track_motorx 0 - -# Motor number for y-axis (default: 0) -track_motory 0 - -# Maximum value on x-axis (default: 0) -track_maxx 0 - -# Maximum value on y-axis (default: 0) -track_maxy 0 - -# ID of an iomojo camera if used (default: 0) -track_iomojo_id 0 - -# Angle in degrees the camera moves per step on the X-axis -# with auto-track (default: 10) -# Currently only used with pwc type cameras -track_step_angle_x 10 - -# Angle in degrees the camera moves per step on the Y-axis -# with auto-track (default: 10) -# Currently only used with pwc type cameras -track_step_angle_y 10 - -# Delay to wait for after tracking movement as number -# of picture frames (default: 10) -track_move_wait 10 - -# Speed to set the motor to (stepper motor option) (default: 255) -track_speed 255 - -# Number of steps to make (stepper motor option) (default: 40) -track_stepsize 40 - - -############################################################ -# External Commands, Warnings and Logging: -# You can use conversion specifiers for the on_xxxx commands -# %Y = year, %m = month, %d = date, -# %H = hour, %M = minute, %S = second, -# %v = event, %q = frame number, %t = thread (camera) number, -# %D = changed pixels, %N = noise level, -# %i and %J = width and height of motion area, -# %K and %L = X and Y coordinates of motion center -# %C = value defined by text_event -# %f = filename with full path -# %n = number indicating filetype -# Both %f and %n are only defined for on_picture_save, -# on_movie_start and on_movie_end -# Quotation marks round string are allowed. -############################################################ - -# Do not sound beeps when detecting motion (default: on) -# Note: Motion never beeps when running in daemon mode. -quiet on - -# Command to be executed when an event starts. (default: none) -# An event starts at first motion detected after a period of no motion defined by gap -; on_event_start value - -# Command to be executed when an event ends after a period of no motion -# (default: none). The period of no motion is defined by option gap. -; on_event_end value - -# Command to be executed when a picture (.ppm|.jpg) is saved (default: none) -# To give the filename as an argument to a command append it with %f -; on_picture_save value - -# Command to be executed when a motion frame is detected (default: none) -; on_motion_detected value - -# Command to be executed when motion in a predefined area is detected -# Check option 'area_detect'. (default: none) -; on_area_detected value - -# Command to be executed when a movie file (.mpg|.avi) is created. (default: none) -# To give the filename as an argument to a command append it with %f -; on_movie_start value - -# Command to be executed when a movie file (.mpg|.avi) is closed. (default: none) -# To give the filename as an argument to a command append it with %f -; on_movie_end value - -# Command to be executed when a camera can't be opened or if it is lost -# NOTE: There is situations when motion doesn't detect a lost camera! -# It depends on the driver, some drivers don't detect a lost camera at all -# Some hang the motion thread. Some even hang the PC! (default: none) -; on_camera_lost value - -############################################################ -# Common Options For MySQL and PostgreSQL database features. -# Options require the MySQL/PostgreSQL options to be active also. -############################################################ - -# Log to the database when creating motion triggered image file (default: on) -sql_log_image on - -# Log to the database when creating a snapshot image file (default: on) -sql_log_snapshot on - -# Log to the database when creating motion triggered mpeg file (default: off) -sql_log_mpeg off - -# Log to the database when creating timelapse mpeg file (default: off) -sql_log_timelapse off - -# SQL query string that is sent to the database -# Use same conversion specifiers has for text features -# Additional special conversion specifiers are -# %n = the number representing the file_type -# %f = filename with full path -# Default value: -# insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') -sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') - - -############################################################ -# Database Options For MySQL -############################################################ - -# Mysql database to log to (default: not defined) -; mysql_db value - -# The host on which the database is located (default: localhost) -; mysql_host value - -# User account name for MySQL database (default: not defined) -; mysql_user value - -# User password for MySQL database (default: not defined) -; mysql_password value - - -############################################################ -# Database Options For PostgreSQL -############################################################ - -# PostgreSQL database to log to (default: not defined) -; pgsql_db value - -# The host on which the database is located (default: localhost) -; pgsql_host value - -# User account name for PostgreSQL database (default: not defined) -; pgsql_user value - -# User password for PostgreSQL database (default: not defined) -; pgsql_password value - -# Port on which the PostgreSQL database is located (default: 5432) -; pgsql_port 5432 - - -############################################################ -# Video Loopback Device (vloopback project) -############################################################ - -# Output images to a video4linux loopback device -# The value '-' means next available (default: not defined) -; video_pipe value - -# Output motion images to a video4linux loopback device -# The value '-' means next available (default: not defined) -; motion_video_pipe value - - -############################################################## -# Thread config files - One for each camera. -# Except if only one camera - You only need this config file. -# If you have more than one camera you MUST define one thread -# config file for each camera in addition to this config file. -############################################################## - -# Remember: If you have more than one camera you must have one -# thread file for each camera. E.g. 2 cameras requires 3 files: -# This motion.conf file AND thread1.conf and thread2.conf. -# Only put the options that are unique to each camera in the -# thread config files. -; thread /usr/local/etc/thread1.conf -; thread /usr/local/etc/thread2.conf -; thread /usr/local/etc/thread3.conf -; thread /usr/local/etc/thread4.conf - diff --git a/config/sane/saned.conf b/config/sane/saned.conf deleted file mode 100644 index 7e25244eb..000000000 --- a/config/sane/saned.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# saned.conf -# -# The contents of the saned.conf file is a list of host names, IP -# addresses or IP subnets (CIDR notation) that are permitted to use local -# SANE devices. IPv6 addresses must be enclosed in brackets, and should -# always be specified in their compressed form. -# -# The hostname matching is not case-sensitive. -# -#scan-client.somedomain.firm -#192.168.0.1 -#192.168.0.1/29 -#[2001:7a8:185e::42:12] -#[2001:7a8:185e::42:12]/64 -# -# NOTE: /etc/inetd.conf (or /etc/xinetd.conf) and -# /etc/services must also be properly configured to start -# the saned daemon as documented in saned(8), services(4) -# and inetd.conf(4) (or xinetd.conf(5)). -# -# a singe "+" allow all hosts to connect. -+ - diff --git a/src/paks/asterisk/install.sh b/src/paks/asterisk/install.sh deleted file mode 100644 index 24ce65775..000000000 --- a/src/paks/asterisk/install.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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 . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -start_service ${NAME} diff --git a/src/paks/asterisk/uninstall.sh b/src/paks/asterisk/uninstall.sh deleted file mode 100644 index bd755e34f..000000000 --- a/src/paks/asterisk/uninstall.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -echo "/var/ipfire/asterisk/" >> /var/ipfire/backup/addons/includes/asterisk -echo "/var/log/asterisk/cdr-csv/" >> /var/ipfire/backup/addons/includes/asterisk -stop_service ${NAME} -make_backup ${NAME} -remove_files diff --git a/src/paks/asterisk/update.sh b/src/paks/asterisk/update.sh deleted file mode 100644 index 99776659c..000000000 --- a/src/paks/asterisk/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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-2020 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -./uninstall.sh -./install.sh diff --git a/src/paks/motion/install.sh b/src/paks/motion/install.sh deleted file mode 100644 index fbdab43ac..000000000 --- a/src/paks/motion/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -restore_backup ${NAME} -useradd -s /bin/false video -#Ignore error if the user already exist -exit 0 diff --git a/src/paks/motion/uninstall.sh b/src/paks/motion/uninstall.sh deleted file mode 100644 index 66f4344eb..000000000 --- a/src/paks/motion/uninstall.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -make_backup ${NAME} -remove_files diff --git a/src/paks/motion/update.sh b/src/paks/motion/update.sh deleted file mode 100644 index 99776659c..000000000 --- a/src/paks/motion/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/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-2020 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -./uninstall.sh -./install.sh diff --git a/src/patches/asterisk-no-ffmpeg.patch b/src/patches/asterisk-no-ffmpeg.patch deleted file mode 100644 index 7bc2e841f..000000000 --- a/src/patches/asterisk-no-ffmpeg.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build/usr/src/asterisk-11.9.0/res/Makefile.orig 2014-04-28 20:30:50.500877461 +0200 -+++ build/usr/src/asterisk-11.9.0/res/Makefile 2014-04-28 20:31:39.357034757 +0200 -@@ -75,7 +75,7 @@ - rm -f pjproject/build.mak - - pjproject/build.mak: pjproject/aconfigure -- (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec) -+ (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec --disable-opencore-amrnb --disable-video --disable-sdl --disable-ffmpeg --disable-v4l2) - - ifneq ($(findstring $(MAKECMDGOALS),all),) - -include pjproject/build.mak diff --git a/src/patches/asterisk-ssl-reader-should-block.patch b/src/patches/asterisk-ssl-reader-should-block.patch deleted file mode 100644 index 3b2f0ed54..000000000 --- a/src/patches/asterisk-ssl-reader-should-block.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream issue 18345 -Link: https://issues.asterisk.org/jira/browse/ASTERISK-18345 -Patch-By: Filip Jenicek - -Submitted upstream: 2012-05-31 09:12 -For Asterisk version: 1.8.4 - -The HOOK_T ssl_read function should behave the same way as the system read function -by blocking and waiting for (more) data from the SSL subsystem. Failure to do this -will drop data on the floor and ultimately disconnect SSL clients. - ---- asterisk/main/tcptls.c -+++ asterisk/main/tcptls.c -@@ -55,6 +55,14 @@ - static HOOK_T ssl_read(void *cookie, char *buf, LEN_T len) - { - int i = SSL_read(cookie, buf, len-1); -+ -+ /* ssl_read should block and wait for the SSL layer to provide all data */ -+ while (i < 0 && SSL_get_error(cookie, i) == SSL_ERROR_WANT_READ) { -+ ast_debug(1, "SSL_read - data not ready.\n"); -+ if (ast_wait_for_input(SSL_get_fd(cookie), 5000) <= 0) return 0; -+ i = SSL_read(cookie, buf, len-1); -+ } -+ - #if 0 - if (i >= 0) - buf[i] = '\0';