Commit 41d45e06 authored by Vitaly Lipatov's avatar Vitaly Lipatov

backported to p8 as 2.6.0-alt0.M80P.1 (with rpmbph script)

parents 418a4968 10ac5ec1
repack: проверять, если нет входного файла; писать полный путь к выходному файлу
apt-mark hold unhold showhold auto manual showauto showmanual
https://manpages.ubuntu.com/manpages/bionic/man8/apt-mark.8.html
на p8, если в sources.list спереди стоит пробел
" rpm http://"
то имеем
......
......@@ -61,7 +61,8 @@ update_repo_if_needed()
cd / || fatal
if ! __is_repo_info_downloaded || ! __is_repo_info_uptodate ; then
load_helper epm-update
pkg_filenames='' epm_update
# FIXME: cleans!!!
$(pkg_filenames='' epm_update)
fi
cd - >/dev/null || fatal
......
......@@ -559,11 +559,9 @@ is_active_systemd()
[ -x "$SYSTEMCTL" ] || return
[ -d "$SYSTEMD_CGROUP_DIR" ] || return
#a='' mountpoint -q "$SYSTEMD_CGROUP_DIR" || return
cat /proc/1/cmdline | grep -q 'systemd' || return
#readlink /sbin/init | grep -q 'systemd' || return
# some hack
# shellcheck disable=SC2009
#ps ax | grep '[s]ystemd' | grep -q -v 'systemd-udev'
cat /proc/1/cmdline | grep -q 'systemd' && return
cat /proc/1/cmdline | grep -q '/sbin/init' || return
readlink /sbin/init | grep -q 'systemd' || return
}
assure_distr()
......
......@@ -25,6 +25,9 @@ __serv_log_altlinux()
postfix)
sudocmd tail -f /var/log/mail/all /var/log/mail/errors
;;
sshd)
sudocmd tail -f /var/log/auth/all
;;
cups)
sudocmd tail -f /var/log/cups/access_log /var/log/cups/error_log
;;
......
# This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
#
Name: eepm
Version: 2.5.10
Version: 2.6.0
Release: alt0.M80P.1
Summary: Etersoft EPM package manager
......@@ -90,9 +90,16 @@ rm -f %buildroot%_datadir/%name/tools_eget
%_sysconfdir/bash_completion.d/cerv
%changelog
* Thu Aug 15 2019 Vitaly Lipatov <lav@altlinux.ru> 2.5.10-alt0.M80P.1
* Tue Oct 01 2019 Vitaly Lipatov <lav@altlinux.ru> 2.6.0-alt0.M80P.1
- backport to ALTLinux p8 (by rpmbph script)
* Sat Sep 28 2019 Vitaly Lipatov <lav@altlinux.ru> 2.6.0-alt1
- add repack.d/XenDesktopVDA.sh (ALT bug 37167)
- fix systemd detection
- epm-check_updated_repo: fix wrong cleaned variable
- serv-log: add sshd support
- repack mssql-server.sh: improve requires
* Thu Aug 15 2019 Vitaly Lipatov <lav@altlinux.ru> 2.5.10-alt1
- move dedup code to the separate command
- epm dedup: add apt-get dedup from apt-get dedup support
......
#!/bin/sh -x
# It will be run with two args: buildroot spec
BUILDROOT="$1"
SPEC="$2"
if [ "$(distr_info -a)" = "x86_64" ] ; then
# 32 bit
rm -rfv $BUILDROOT/opt/Citrix/VDA/lib32
subst "s|.*/libctxXrandrhook.so.||" $SPEC
fi
#REQUIRES=""
subst "s|^\(Name: .*\)$|%filter_from_requires /AuthManagerDaemon/d\n\1|g" $SPEC
......@@ -4,4 +4,7 @@
BUILDROOT="$1"
SPEC="$2"
subst "s|^\(Name: .*\)$|# FIXME: due libcrypto.so.10(libcrypto.so.10)(64bit) autoreqs\nAutoReq:yes,nolib\n# Converted from original package requires\nRequires:libssl pbzip2 bzip2 gdb python-base libnuma libkrb5 libsss_nss_idmap\n\1|g" $SPEC
# we need libssl/libcrypto-devel due libssl.so/libcrypto.so using (ALT bug 35559)
REQUIRES="libssl libssl-devel libcrypto-devel pbzip2 bzip2 gdb python-base libnuma libkrb5 libsss_nss_idmap cyrus-sasl2 libsasl2-plugin-gssapi"
subst "s|^\(Name: .*\)$|# FIXME: due libcrypto.so.10(libcrypto.so.10)(64bit) autoreqs\nAutoReq:yes,nolib\n# Converted from original package requires\nRequires:$REQUIRES\n\1|g" $SPEC
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment