parent
37ecbb0b57
commit
57b0267e20
@ -1 +1 @@
|
||||
# Calculate append=skip merge(sys-auth/elogind)!= merge=x11-misc/sddm
|
||||
# Calculate append=skip merge(sys-auth/elogind)!= merge=x11-misc/sddm,sys-auth/pambase
|
||||
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge(x11-themes/calculate-icon-theme)!= merge=x11-misc/qt5ct
|
||||
@ -0,0 +1,2 @@
|
||||
# Calculate mergepkg()!= path=/etc name=vhosts
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=openrc
|
||||
|
||||
vhost_server="nginx"
|
||||
@ -0,0 +1 @@
|
||||
# Calculate path=/ name=etc mergepkg()!=
|
||||
@ -0,0 +1,37 @@
|
||||
# Calculate format=patch multiline link=/usr/share/doc/rsnapshot-#-cut(0,-,#-pkg(app-backup/rsnapshot)-#)-#/rsnapshot.conf.default mirror
|
||||
<reg>^(snapshot_root\s+).*$</reg>
|
||||
<text>\1/var/calculate/snapshots</text>
|
||||
<reg>^#?(cmd_cp\s+).*$</reg>
|
||||
<text>\1/bin/cp</text>
|
||||
<reg>^#?(cmd_ssh\s+).*$</reg>
|
||||
<text>\1/usr/bin/ssh</text>
|
||||
<reg>^#?(cmd_du\s+).*$</reg>
|
||||
<text>\1/usr/bin/du</text>
|
||||
<reg>^(retain\s+)alpha\s+\d+.*$</reg>
|
||||
<text>\1daily\t5</text>
|
||||
<reg>^(retain\s+)beta\s+\d+.*$</reg>
|
||||
<text>\1weekly\t4</text>
|
||||
<reg>^(retain\s+)gamma\s+\d+.*$</reg>
|
||||
<text>\1monthly\t3</text>
|
||||
<reg>^#?retain\s+delta.*\n</reg>
|
||||
<text></text>
|
||||
<reg>^#?(rsync_short_args\s+).*$</reg>
|
||||
<text>\1-aAX</text>
|
||||
<reg>^#?(rsync_long_args\s+).*$</reg>
|
||||
<text>\1--delete --numeric-ids --delete-excluded</text>
|
||||
<reg>^#?(one_fs).*$</reg>
|
||||
<text>\1\t\t\t1</text>
|
||||
<reg>^#?(include_file\s+).*$</reg>
|
||||
<text>\1/etc/rsnapshot.d/rsnapshot.filter</text>
|
||||
<reg>^#?(include_file\s+).*$</reg>
|
||||
<text>\1/etc/rsnapshot.d/rsnapshot.filter</text>
|
||||
<reg>^#?(link_dest).*$</reg>
|
||||
<text>\1\t1</text>
|
||||
<reg>^#?(sync_first).*$</reg>
|
||||
<text>\1\t1</text>
|
||||
<reg>^#?(use_lazy_deletes).*$</reg>
|
||||
<text>\1\t1</text>
|
||||
<reg>^(backup\s+)</reg>
|
||||
<text>#\1</text>
|
||||
<reg>\Z</reg>
|
||||
<text>include_conf\t`/bin/cat /etc/rsnapshot.d/*.conf`\n</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# LOCALHOST
|
||||
#backup / localhost/rootfs/
|
||||
#backup /var/calculate localhost/calculate/
|
||||
@ -0,0 +1,27 @@
|
||||
- /container/*
|
||||
- /dev
|
||||
- /linux/*
|
||||
- /lost+found
|
||||
- /lxc/*/calculate/packages
|
||||
- /lxc/**/remote/distfiles
|
||||
- /lxc/*/rootfs/proc
|
||||
- /lxc/*/rootfs/run
|
||||
- /lxc/*/rootfs/sys
|
||||
- /lxc/*/rootfs/tmp
|
||||
- /lxc/*/rootfs/usr/portage
|
||||
- /lxc/*/rootfs/var/calculate/packages
|
||||
- /lxc/*/rootfs/var/lib/layman
|
||||
- /lxc/*/rootfs/var/log
|
||||
- /lxc/*/snaps
|
||||
- /packages
|
||||
- /proc
|
||||
- /remote/distfiles
|
||||
- /run
|
||||
- /snapshots/*
|
||||
- /sys
|
||||
- /tmp
|
||||
- /usr/portage/*
|
||||
- /var/calculate/snapshots/*
|
||||
- /var/lib/layman/*
|
||||
- /var/log/*
|
||||
- /vps/*
|
||||
@ -0,0 +1,65 @@
|
||||
# Calculate chmod=0755 path=/usr/libexec
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright (C) 2018 Mir Calculate Ltd.
|
||||
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
#
|
||||
# The script allows you to create daily, weekly (from Monday), and monthly
|
||||
# (every 4 weeks) backups automatically, with a single daily startup.
|
||||
|
||||
weekseconds="$(( 60 * 60 * 24 * 7 ))"
|
||||
|
||||
get_value() {
|
||||
awk -F"\t" "{if (\$1 == \"$1\") print \$2}" | tail -1
|
||||
}
|
||||
|
||||
get_retain_value() {
|
||||
awk -F"\t" "{if (\$1 == \"retain\" && \$2 == \"$1\") print \$3}" | tail -1
|
||||
}
|
||||
|
||||
declare -A res
|
||||
|
||||
base_configfile=/etc/rsnapshot.conf
|
||||
configfiles=${@:-$base_configfile}
|
||||
|
||||
for configfile in $configfiles
|
||||
do
|
||||
rsnapshot -c $configfile sync
|
||||
res["$configfile"]=$?
|
||||
done
|
||||
|
||||
for configfile in $configfiles
|
||||
do
|
||||
snapshot_root="$(cat $base_configfile $configfile | get_value snapshot_root)"
|
||||
retain_daily="$(cat $base_configfile $configfile | get_retain_value daily)"
|
||||
|
||||
# calculating the day of the week when need to do rotation, so that a copy
|
||||
# comes in weekly from Monday
|
||||
if [[ $(date +"%w") -eq $(( ($retain_daily + 1) % 7 )) ]]
|
||||
then
|
||||
# it's time to make a monthly backup
|
||||
if [[ $(( $(date +"%s") / $weekseconds % 4 )) -eq 0 ]]
|
||||
then
|
||||
rsnapshot -c $configfile monthly
|
||||
fi
|
||||
rsnapshot -c $configfile weekly
|
||||
fi
|
||||
# fix the backup as daily if there was no error
|
||||
if [[ ${res["$configfile"]} -ne 1 ]]
|
||||
then
|
||||
rsnapshot -c $configfile daily
|
||||
# write current time to backup for reference
|
||||
date >${snapshot_root}/daily.0/timestamp
|
||||
fi
|
||||
done
|
||||
@ -0,0 +1 @@
|
||||
# Calculate path=/var/calculate chmod=0700
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip
|
||||
@ -0,0 +1 @@
|
||||
# Calculate mergepkg()==3.6.6-r2 path=/usr/share name=applications
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=kde
|
||||
[Desktop Entry]
|
||||
Icon=input-keyboard
|
||||
@ -0,0 +1 @@
|
||||
# Calculate mergepkg()!= path=/usr/share
|
||||
|
After Width: | Height: | Size: 112 KiB |
@ -0,0 +1 @@
|
||||
# Calculate path=/usr/share/kpackage/genericqml/org.kde.systemsettings.sidebar/contents name=ui mergepkg()==5.12.5
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch
|
||||
<reg>height: (Kirigami.Units.gridUnit [*] 2.5)</reg>
|
||||
<text>height: Math.round(\1)</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch
|
||||
<reg>height: (Kirigami.Units.gridUnit [*] 2.5)</reg>
|
||||
<text>height: Math.round(\1)</text>
|
||||
@ -0,0 +1 @@
|
||||
# Calculate link=/etc/fonts/conf.avail/10-sub-pixel-rgb.conf symbolic
|
||||
@ -0,0 +1 @@
|
||||
# Calculate link=/etc/fonts/conf.avail/11-lcdfilter-default.conf symbolic
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate path=/etc/modprobe.d
|
||||
|
||||
options amdgpu cik_support=1 si_support=1
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate path=/etc/modprobe.d
|
||||
|
||||
options vboxvideo modeset=0
|
||||
@ -1,79 +0,0 @@
|
||||
|
||||
load_videodrv() {
|
||||
info "Loading frame buffer video driver"
|
||||
# find all available fb drivers
|
||||
videodrv_count=$(find /lib/modules \
|
||||
-name "nouveau.ko*" -o \
|
||||
-name "uvesafb.ko*" -o \
|
||||
-name "i915.ko*" -o \
|
||||
-name "amdgpu.ko*" -o \
|
||||
-name "radeon.ko*" |
|
||||
grep -c "")
|
||||
# load specified videodrv
|
||||
modules_list=
|
||||
case "${videodrv}" in
|
||||
nouveau)
|
||||
modules_list="nouveau"
|
||||
;;
|
||||
radeon)
|
||||
modules_list="radeon"
|
||||
;;
|
||||
amdgpu)
|
||||
modules_list="amdgpu"
|
||||
;;
|
||||
none)
|
||||
return 0;
|
||||
;;
|
||||
i915|intel)
|
||||
modules_list="i915"
|
||||
;;
|
||||
""|auto)
|
||||
# videoautodetect
|
||||
if [[ -x /usr/sbin/lspci ]]
|
||||
then
|
||||
if lspci | grep -m1 VGA | grep -qi intel
|
||||
then
|
||||
modules_list="i915"
|
||||
elif lspci | grep -m1 VGA | grep -qi nvidia
|
||||
then
|
||||
modules_list="nouveau"
|
||||
elif lspci | grep -m1 VGA | grep -q -e "Ati" -e "ATI"
|
||||
then
|
||||
modules_list="radeon"
|
||||
else
|
||||
modules_list=""
|
||||
fi
|
||||
else
|
||||
modules_list="i915"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
for x in $modules_list
|
||||
do
|
||||
if [ "`find /lib/modules -name "${x}.ko*" | grep -c ''`" -eq "1" ]
|
||||
then
|
||||
# i915 will be load by udev
|
||||
[ "${x}" == "i915" ] && return
|
||||
if [ "${x}" == "amdgpu" ]
|
||||
then
|
||||
modprobe amdgpu cik_support=1 si=support=1 &>/dev/null
|
||||
else
|
||||
modprobe "${x}" modeset=1 &>/dev/null
|
||||
fi
|
||||
lsmod | grep -q "^${x}" && \
|
||||
[ "`cat /sys/module/${x}/refcnt`" -gt 0 ] && return 0
|
||||
fi
|
||||
done
|
||||
# else load uvesafb with specified video resolution
|
||||
if [ -n "${videoresolution}" ]
|
||||
then
|
||||
if ! echo $videoresolution | grep -q "\-"
|
||||
then
|
||||
videoresolution="${videoresolution}-32"
|
||||
fi
|
||||
else
|
||||
videoresolution="1024x768-32"
|
||||
fi
|
||||
modprobe uvesafb mode_option=${videoresolution} &>/dev/null
|
||||
}
|
||||
load_videodrv
|
||||
@ -0,0 +1,31 @@
|
||||
# Calculate chmod=0755
|
||||
#!/bin/bash
|
||||
|
||||
blacklistfile=$1
|
||||
videomodule=$2
|
||||
|
||||
if [[ -n $videomodule ]]
|
||||
then
|
||||
cat >$blacklistfile <<EOF
|
||||
# This file was created by initramfs
|
||||
# Do not edit this file manually
|
||||
# Please use cl-setup-video to select video driver
|
||||
|
||||
EOF
|
||||
case $videomodule in
|
||||
nouveau)
|
||||
echo "blacklist nvidia" >>$blacklistfile
|
||||
;;
|
||||
radeon)
|
||||
echo "blacklist amdgpu" >>$blacklistfile
|
||||
;;
|
||||
nvidia)
|
||||
echo "blacklist nouveau" >>$blacklistfile
|
||||
;;
|
||||
amdgpu)
|
||||
echo "blacklist radeon" >>$blacklistfile
|
||||
;;
|
||||
esac
|
||||
else
|
||||
rm -f $blacklistfile
|
||||
fi
|
||||
@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
mount -o rw,remount ${NEWROOT} &>/dev/null
|
||||
/sbin/select-video.sh ${NEWROOT}/etc/modprobe.d/video-blacklist.conf $videodrv
|
||||
@ -1,2 +0,0 @@
|
||||
# Calculate mergepkg()!= append=skip
|
||||
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=remove path=/usr/lib64/firefox/browser/extensions/langpack-ru@firefox.mozilla.org/browser/chrome/ru/locale/browser/searchplugins name=yandex-ru.xml
|
||||
@ -1,2 +0,0 @@
|
||||
# Calculate merge()!=&&pkg()!= path=/etc name=env.d
|
||||
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=remove path=/etc/local.d
|
||||
@ -1 +0,0 @@
|
||||
# Calculate append=remove path=/etc/local.d
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate pkg(x11-drivers/nvidia-drivers[kms])!= path=/etc/modprobe.d
|
||||
# Nvidia modeset conf
|
||||
options nvidia-drm modeset=1
|
||||
@ -0,0 +1 @@
|
||||
# Calculate mergepkg()!= path=/usr/share name=applications
|
||||
@ -0,0 +1,9 @@
|
||||
# Calculate format=kde
|
||||
[Desktop Entry]
|
||||
Name=Qt5 Settings
|
||||
Exec=qt5ct
|
||||
#?pkg(x11-themes/calculate-icon-theme)>=15-r8#
|
||||
Icon=qt5logo
|
||||
Categories=Settings;DesktopSettings;LXQt;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
|
||||
OnlyShowIn=XFCE;MATE;LXQt;
|
||||
#pkg#
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<40
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate path="#-ini(resource.desktop)-#" pkg(gnome-extra/cinnamon-session)!=&&ini(resource.desktop)!=&&exists(#-ini(resource.desktop)-#/FTP.desktop)!=
|
||||
<reg>Icon=update-manager</reg>
|
||||
<text>Icon=folder-download</text>
|
||||
@ -0,0 +1,7 @@
|
||||
# Calculate format=samba path=~/.calculate
|
||||
|
||||
[ver]
|
||||
patch = 40
|
||||
|
||||
[update]
|
||||
patch = on
|
||||
@ -0,0 +1 @@
|
||||
# Calculate path=~/.cinnamon pkg(gnome-extra/cinnamon-session)!=
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/ftp.desktop)!=
|
||||
<reg>Icon=(folder-download|update-manager)</reg>
|
||||
<text>Icon=folder-download-symbolic</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/home.desktop)!=
|
||||
<reg>Icon=user-home</reg>
|
||||
<text>Icon=user-home-symbolic</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/homedir.desktop)!=
|
||||
<reg>Icon=folder_home</reg>
|
||||
<text>Icon=user-home-symbolic</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/lockscreen.desktop)!=
|
||||
<reg>Icon=gnome-lockscreen</reg>
|
||||
<text>Icon=system-lock-screen-symbolic</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/poweroff.desktop)!=
|
||||
<reg>Icon=gnome-shutdown</reg>
|
||||
<text>Icon=system-shutdown-symbolic</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/share.desktop)!=
|
||||
<reg>Icon=folder-remote</reg>
|
||||
<text>Icon=folder-remote-symbolic</text>
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<41
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate path="#-ini(resource.desktop)-#" pkg(gnome-extra/cinnamon-session)!=&&ini(resource.desktop)!=&&exists(#-ini(resource.desktop)-#/FTP.desktop)!=
|
||||
<reg>Icon=update-manager</reg>
|
||||
<text>Icon=folder-download</text>
|
||||
@ -0,0 +1,7 @@
|
||||
# Calculate format=samba path=~/.calculate
|
||||
|
||||
[ver]
|
||||
patch = 41
|
||||
|
||||
[update]
|
||||
patch = on
|
||||
@ -0,0 +1 @@
|
||||
# Calculate path=~/.cinnamon pkg(gnome-extra/cinnamon-session)!=
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/ftp.desktop)!=
|
||||
<reg>Icon=(update-manager|folder-download-symbolic)</reg>
|
||||
<text>Icon=folder-download</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/home.desktop)!=
|
||||
<reg>Icon=user-home-symbolic</reg>
|
||||
<text>Icon=user-home</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/homedir.desktop)!=
|
||||
<reg>Icon=(folder_home|user-home-symbolic)</reg>
|
||||
<text>Icon=user-home</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/lockscreen.desktop)!=
|
||||
<reg>Icon=(gnome-lockscreen|system-lock-screen-symbolic)</reg>
|
||||
<text>Icon=system-lock-screen</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/poweroff.desktop)!=
|
||||
<reg>Icon=(gnome-shutdown|system-shutdown-symbolic)</reg>
|
||||
<text>Icon=system-shutdown</text>
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=patch exists(~/.cinnamon/panel-launchers/share.desktop)!=
|
||||
<reg>Icon=folder-remote-symbolic</reg>
|
||||
<text>Icon=folder-remote</text>
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge(sys-apps/calculate-utils)!=&&ini(update.patch)!=off&&ini(ver.patch)<42
|
||||
@ -0,0 +1,7 @@
|
||||
# Calculate format=samba path=~/.calculate
|
||||
|
||||
[ver]
|
||||
patch = 42
|
||||
|
||||
[update]
|
||||
patch = on
|
||||
@ -0,0 +1,3 @@
|
||||
# Calculate format=kde path=~/.config pkg(kde-plasma/kwin)!=
|
||||
[org.kde.kdecoration2]
|
||||
!ButtonsOnLeft=MNS
|
||||
@ -0,0 +1,12 @@
|
||||
# Calculate format=kde name=io.github.Hexchat.desktop link=/usr/share/applications/io.github.Hexchat.desktop mirror pkg(net-irc/hexchat)>=2.14
|
||||
|
||||
[Desktop Entry]
|
||||
#?os_locale_language==fr#
|
||||
Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-fr"
|
||||
#os_locale_language#
|
||||
#?os_locale_language==ru#
|
||||
Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate-ru"
|
||||
#os_locale_language#
|
||||
#?in(os_locale_language,fr,ru)==#
|
||||
Exec=hexchat "--url=irc://irc.freenode.net:6667/#calculate"
|
||||
#in#
|
||||
@ -1,4 +1,4 @@
|
||||
# Calculate format=kde link=/usr/share/applications/hexchat.desktop mirror
|
||||
# Calculate format=kde name=hexchat.desktop link=/usr/share/applications/hexchat.desktop mirror pkg(net-irc/hexchat)=>2.9,2.14
|
||||
|
||||
[Desktop Entry]
|
||||
#?os_locale_language==fr#
|
||||
@ -1,7 +1,7 @@
|
||||
# Calculate path=~/.calculate format=samba
|
||||
|
||||
[ver]
|
||||
firefox = 45
|
||||
firefox = 52
|
||||
|
||||
[update]
|
||||
firefox = on
|
||||
|
||||
@ -1 +0,0 @@
|
||||
# Calculate mergepkg()>=0.31&&ini(update.qt5ct)!=off&&ini(ver.qt5ct)== path=~/.config name=qt5ct
|
||||
@ -0,0 +1 @@
|
||||
# Calculate mergepkg()>=0.35&&ini(update.qt5ct)!=off&&ini(ver.qt5ct)<0.35 path=~/.config name=qt5ct
|
||||
@ -1,7 +1,7 @@
|
||||
# Calculate format=samba path=~/.calculate
|
||||
|
||||
[ver]
|
||||
qt5ct = 0.31
|
||||
qt5ct = 0.35
|
||||
|
||||
[update]
|
||||
qt5ct = on
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip
|
||||
@ -0,0 +1,63 @@
|
||||
# Calculate format=diff
|
||||
--- clamsmtp-1.10/common/usuals.h 2007-05-27 01:57:56.000000000 +0200
|
||||
+++ clamsmtp-patched/common/usuals.h 2015-03-01 16:48:10.684201573 +0100
|
||||
@@ -39,10 +39,10 @@
|
||||
#ifndef __USUALS_H__
|
||||
#define __USUALS_H__
|
||||
|
||||
-#include <sys/types.h>
|
||||
-
|
||||
#include "config.h"
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
diff -Nru clamsmtp-1.10/configure.in clamsmtp-patched/configure.in
|
||||
--- clamsmtp-1.10/configure.in 2008-06-30 19:01:48.000000000 +0200
|
||||
+++ clamsmtp-patched/configure.in 2015-03-01 16:40:02.278986882 +0100
|
||||
@@ -51,6 +51,8 @@
|
||||
AC_PROG_LN_S
|
||||
AC_PROG_MAKE_SET
|
||||
|
||||
+AC_USE_SYSTEM_EXTENSIONS
|
||||
+
|
||||
# Debug mode
|
||||
AC_ARG_ENABLE(debug,=20
|
||||
AC_HELP_STRING([--enable-debug],
|
||||
|
||||
diff -Nru clamsmtp-1.10/common/smtppass.c clamsmtp-patched/common/smtppass.c
|
||||
--- clamsmtp-1.10/common/smtppass.c 2015-03-02 09:36:27.793398352 +0100
|
||||
+++ clamsmtp-patched/common/smtppass.c 2015-03-02 09:38:50.843467581 +0100
|
||||
@@ -38,6 +38,8 @@
|
||||
* Olivier Beyssac <ob@r14.freenix.org>
|
||||
*/
|
||||
|
||||
+#include "usuals.h"
|
||||
+
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -58,17 +58,15 @@
|
||||
#include <pwd.h>
|
||||
#include <time.h>
|
||||
|
||||
-#include "usuals.h"
|
||||
-
|
||||
-#ifdef LINUX_TRANSPARENT_PROXY
|
||||
-#include <linux/netfilter_ipv4.h>
|
||||
-#endif
|
||||
-
|
||||
#include "compat.h"
|
||||
#include "sock_any.h"
|
||||
#include "stringx.h"
|
||||
#include "sppriv.h"
|
||||
|
||||
+#ifdef LINUX_TRANSPARENT_PROXY
|
||||
+#include <linux/netfilter_ipv4.h>
|
||||
+#endif
|
||||
+
|
||||
/* -----------------------------------------------------------------------
|
||||
* STRUCTURES
|
||||
*/
|
||||
@ -0,0 +1 @@
|
||||
# Calculate merge()!= append=skip
|
||||
@ -0,0 +1,77 @@
|
||||
# Calculate format=diff merge(media-gfx/nomacs)==3.8.0
|
||||
commit 92a95cd288dd64829e33aeb5d8c6e9725219e6bd
|
||||
Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
|
||||
Date: Mon Jan 29 12:01:50 2018 +0100
|
||||
|
||||
cmake: Stop calling QT5_WRAP_CPP() when building quazip and libqpsd.
|
||||
|
||||
cmake/Utils.cmake already sets CMAKE_AUTOMOC to on.
|
||||
|
||||
Calling QT5_WRAP_CPP() used to be just redundant, as QUAZIP_MOC_SRC and
|
||||
LIBQPSD_MOC_SRC were never actually added as source dependencies in
|
||||
MacBuildTarget.cmake and UnixBuildTarget.cmake. In other words, CMake's own
|
||||
automoc infrastructure was actually being used and the moc invocations from
|
||||
QT5_WRAP_CPP() were not being made at all.
|
||||
|
||||
Starting with Qt 5.9.4, calling QT5_WRAP_CPP() disables the AUTOMOC property
|
||||
on the macro's input files, which means neither CMake's automoc
|
||||
infrastructure not QT5_WRAP_CPP()'s code were being used and we ended up
|
||||
with several 'undefined reference to vtable' errors when linking.
|
||||
|
||||
diff --git a/ImageLounge/cmake/Mac.cmake b/ImageLounge/cmake/Mac.cmake
|
||||
index 73c01430..14e9494d 100644
|
||||
--- a/ImageLounge/cmake/Mac.cmake
|
||||
+++ b/ImageLounge/cmake/Mac.cmake
|
||||
@@ -104,7 +104,6 @@ unset(QUAZIP_LIBRARIES CACHE)
|
||||
|
||||
unset(QUAZIP_HEADERS CACHE)
|
||||
unset(QUAZIP_SOURCES CACHE)
|
||||
-unset(QUAZIP_MOCS CACHE)
|
||||
unset(QT_ROOT CACHE)
|
||||
|
||||
if(ENABLE_QUAZIP)
|
||||
@@ -123,9 +122,7 @@ if(ENABLE_QUAZIP)
|
||||
|
||||
file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
|
||||
file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
|
||||
- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
|
||||
|
||||
- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
|
||||
add_definitions(-DWITH_QUAZIP)
|
||||
endif(USE_SYSTEM_QUAZIP)
|
||||
endif(ENABLE_QUAZIP)
|
||||
@@ -134,5 +131,3 @@ endif(ENABLE_QUAZIP)
|
||||
# add libqpsd
|
||||
file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
|
||||
file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
|
||||
-file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
|
||||
-QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
|
||||
diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake
|
||||
index 4cf2c0ec..5297d48c 100644
|
||||
--- a/ImageLounge/cmake/Unix.cmake
|
||||
+++ b/ImageLounge/cmake/Unix.cmake
|
||||
@@ -97,7 +97,6 @@ unset(QUAZIP_LIBRARIES CACHE)
|
||||
|
||||
unset(QUAZIP_HEADERS CACHE)
|
||||
unset(QUAZIP_SOURCES CACHE)
|
||||
-unset(QUAZIP_MOCS CACHE)
|
||||
unset(QT_ROOT CACHE)
|
||||
|
||||
if(ENABLE_QUAZIP)
|
||||
@@ -116,9 +115,7 @@ if(ENABLE_QUAZIP)
|
||||
|
||||
file(GLOB QUAZIP_SOURCES "3rdparty/quazip-0.7/quazip/*.c" "3rdparty/quazip-0.7/quazip/*.cpp")
|
||||
file(GLOB QUAZIP_HEADERS "3rdparty/quazip-0.7/quazip/*.h")
|
||||
- file(GLOB QUAZIP_MOCS "3rdparty/quazip-0.7/quazip/*.h")
|
||||
|
||||
- QT5_WRAP_CPP(QUAZIP_MOC_SRC ${QUAZIP_MOCS})
|
||||
add_definitions(-DWITH_QUAZIP)
|
||||
endif(USE_SYSTEM_QUAZIP)
|
||||
endif(ENABLE_QUAZIP)
|
||||
@@ -132,6 +129,4 @@ IF(USE_SYSTEM_LIBQPSD)
|
||||
ELSE()
|
||||
file(GLOB LIBQPSD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.cpp")
|
||||
file(GLOB LIBQPSD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
|
||||
- file(GLOB LIBQPSD_MOCS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd/*.h")
|
||||
- QT5_WRAP_CPP(LIBQPSD_MOC_SRC ${LIBQPSD_MOCS})
|
||||
ENDIF(USE_SYSTEM_LIBQPSD)
|
||||
@ -0,0 +1 @@
|
||||
# Calculate append=skip merge()=>2.2.0,2.2.1
|
||||
@ -0,0 +1,103 @@
|
||||
# Calculate format=diff
|
||||
--- diseqc.c 2015/01/26 12:02:14 4.0
|
||||
+++ diseqc.c 2017/01/09 15:10:40
|
||||
@@ -253,10 +253,10 @@
|
||||
return result;
|
||||
}
|
||||
|
||||
-uint cDiseqc::SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const
|
||||
+int cDiseqc::SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const
|
||||
{
|
||||
if ((Codes[0] & 0xF0) == 0x70 ) { // EN50607 aka JESS
|
||||
- uint t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
|
||||
+ int t = SatFrequency == 0 ? 0 : (SatFrequency - 100);
|
||||
if (t < 2048 && Scr->Channel() >= 0 && Scr->Channel() < 32) {
|
||||
Codes[1] = t >> 8 | Scr->Channel() << 3;
|
||||
Codes[2] = t;
|
||||
@@ -266,7 +266,7 @@
|
||||
}
|
||||
}
|
||||
else { // EN50494 aka Unicable
|
||||
- uint t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
|
||||
+ int t = SatFrequency == 0 ? 0 : (SatFrequency + Scr->UserBand() + 2) / 4 - 350; // '+ 2' together with '/ 4' results in rounding!
|
||||
if (t < 1024 && Scr->Channel() >= 0 && Scr->Channel() < 8) {
|
||||
Codes[3] = t >> 8 | (t == 0 ? 0 : scrBank << 2) | Scr->Channel() << 5;
|
||||
Codes[4] = t;
|
||||
@@ -399,7 +399,7 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
-cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const
|
||||
+cDiseqc::eDiseqcActions cDiseqc::Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const
|
||||
{
|
||||
if (!*CurrentAction)
|
||||
*CurrentAction = commands;
|
||||
--- diseqc.h 2013/06/12 11:52:17 4.0
|
||||
+++ diseqc.h 2017/01/09 15:11:19
|
||||
@@ -86,7 +86,7 @@
|
||||
mutable int scrBank;
|
||||
char *commands;
|
||||
bool parsing;
|
||||
- uint SetScrFrequency(uint SatFrequency, const cScr *Scr, uint8_t *Codes) const;
|
||||
+ int SetScrFrequency(int SatFrequency, const cScr *Scr, uint8_t *Codes) const;
|
||||
int SetScrPin(const cScr *Scr, uint8_t *Codes) const;
|
||||
const char *Wait(const char *s) const;
|
||||
const char *GetPosition(const char *s) const;
|
||||
@@ -96,7 +96,7 @@
|
||||
cDiseqc(void);
|
||||
~cDiseqc();
|
||||
bool Parse(const char *s);
|
||||
- eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, uint *Frequency) const;
|
||||
+ eDiseqcActions Execute(const char **CurrentAction, uchar *Codes, uint8_t *MaxCodes, const cScr *Scr, int *Frequency) const;
|
||||
///< Parses the DiSEqC commands and returns the appropriate action code
|
||||
///< with every call. CurrentAction must be the address of a character pointer,
|
||||
///< which is initialized to NULL. This pointer is used internally while parsing
|
||||
--- dvbdevice.c 2016/11/07 13:55:58 4.3
|
||||
+++ dvbdevice.c 2017/01/09 15:11:39
|
||||
@@ -329,7 +329,7 @@
|
||||
void ClearEventQueue(void) const;
|
||||
bool GetFrontendStatus(fe_status_t &Status) const;
|
||||
cPositioner *GetPositioner(void);
|
||||
- void ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency);
|
||||
+ void ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency);
|
||||
void ResetToneAndVoltage(void);
|
||||
bool SetFrontend(void);
|
||||
virtual void Action(void);
|
||||
@@ -696,7 +696,7 @@
|
||||
return positioner;
|
||||
}
|
||||
|
||||
-void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, unsigned int *Frequency)
|
||||
+void cDvbTuner::ExecuteDiseqc(const cDiseqc *Diseqc, int *Frequency)
|
||||
{
|
||||
if (!lnbPowerTurnedOn) {
|
||||
CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, SEC_VOLTAGE_13)); // must explicitly turn on LNB power
|
||||
@@ -806,7 +806,7 @@
|
||||
|
||||
SETCMD(DTV_DELIVERY_SYSTEM, frontendType);
|
||||
if (frontendType == SYS_DVBS || frontendType == SYS_DVBS2) {
|
||||
- unsigned int frequency = channel.Frequency();
|
||||
+ int frequency = channel.Frequency();
|
||||
if (Setup.DiSEqC) {
|
||||
if (const cDiseqc *diseqc = Diseqcs.Get(device->CardIndex() + 1, channel.Source(), frequency, dtp.Polarization(), &scr)) {
|
||||
frequency -= diseqc->Lof();
|
||||
@@ -829,7 +829,7 @@
|
||||
}
|
||||
else {
|
||||
int tone = SEC_TONE_OFF;
|
||||
- if (frequency < (unsigned int)Setup.LnbSLOF) {
|
||||
+ if (frequency < Setup.LnbSLOF) {
|
||||
frequency -= Setup.LnbFrequLo;
|
||||
tone = SEC_TONE_OFF;
|
||||
}
|
||||
--- remux.c 2016/12/22 12:58:20 4.3
|
||||
+++ remux.c 2017/01/09 15:05:05
|
||||
@@ -1629,7 +1629,7 @@
|
||||
Div += parser->IFrameTemporalReferenceOffset();
|
||||
if (Div <= 0)
|
||||
Div = 1;
|
||||
- uint32_t Delta = ptsValues[0] / Div;
|
||||
+ int Delta = ptsValues[0] / Div;
|
||||
// determine frame info:
|
||||
if (isVideo) {
|
||||
if (Delta == 3753)
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue