Signed-off-by: François Andriot <albator78@libertysurf.fr>pull/164/head
François Andriot
2 years ago
parent
91c340e19d
commit
b504f7ef78
@ -1 +0,0 @@
|
|||||||
../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/gtk-qt-engine.rc.sh
|
|
||||||
@ -1 +0,0 @@
|
|||||||
../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde-kde4
|
|
||||||
@ -1 +0,0 @@
|
|||||||
../../../ubuntu/xenial/applications/themes/gtk-qt-engine/debian/.gtkrc-2.0-kde4
|
|
||||||
@ -0,0 +1,160 @@
|
|||||||
|
#
|
||||||
|
# spec file for package tdeio-appinfo (version R14)
|
||||||
|
#
|
||||||
|
# Copyright (c) 2014 Trinity Desktop Environment
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
#
|
||||||
|
# Please submit bugfixes or comments via http://www.trinitydesktop.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# TDE variables
|
||||||
|
%define tde_epoch 2
|
||||||
|
%if "%{?tde_version}" == ""
|
||||||
|
%define tde_version 14.1.0
|
||||||
|
%endif
|
||||||
|
%define tde_pkg tdeio-appinfo
|
||||||
|
%define tde_prefix /opt/trinity
|
||||||
|
%define tde_bindir %{tde_prefix}/bin
|
||||||
|
%define tde_datadir %{tde_prefix}/share
|
||||||
|
%define tde_docdir %{tde_datadir}/doc
|
||||||
|
%define tde_includedir %{tde_prefix}/include
|
||||||
|
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||||
|
%define tde_mandir %{tde_datadir}/man
|
||||||
|
%define tde_tdeappdir %{tde_datadir}/applications/tde
|
||||||
|
%define tde_tdedocdir %{tde_docdir}/tde
|
||||||
|
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||||
|
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||||
|
|
||||||
|
|
||||||
|
Name: trinity-%{tde_pkg}
|
||||||
|
Epoch: %{tde_epoch}
|
||||||
|
Version: 0.3
|
||||||
|
Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
|
||||||
|
Summary: TDEIO slave for the appinfo protocol
|
||||||
|
Group: Productivity/Networking/Ftp/Clients
|
||||||
|
URL: http://lukeplant.me.uk/kio-appinfo/
|
||||||
|
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
License: GPL-2.0+
|
||||||
|
%else
|
||||||
|
License: GPLv2+
|
||||||
|
%endif
|
||||||
|
|
||||||
|
#Vendor: Trinity Desktop
|
||||||
|
#Packager: Francois Andriot <francois.andriot@free.fr>
|
||||||
|
|
||||||
|
Prefix: %{tde_prefix}
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
|
||||||
|
|
||||||
|
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
|
||||||
|
BuildRequires: trinity-tdebase-devel >= %{tde_version}
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: gettext
|
||||||
|
|
||||||
|
BuildRequires: trinity-cmake >= %{tde_version}
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: pkgconfig
|
||||||
|
BuildRequires: fdupes
|
||||||
|
|
||||||
|
# ACL support
|
||||||
|
BuildRequires: libacl-devel
|
||||||
|
|
||||||
|
# IDN support
|
||||||
|
BuildRequires: libidn-devel
|
||||||
|
|
||||||
|
# OPENSSL support
|
||||||
|
BuildRequires: openssl-devel
|
||||||
|
|
||||||
|
# SUSE desktop files utility
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
BuildRequires: update-desktop-files
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?opensuse_bs} && 0%{?suse_version}
|
||||||
|
# for xdg-menu script
|
||||||
|
BuildRequires: brp-check-trinity
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%description
|
||||||
|
Adds support for the "appinfo:" protocol
|
||||||
|
to Konqueror and other TDE applications.
|
||||||
|
.
|
||||||
|
This enables you to perform appinfo: searches in TDE.
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
|
||||||
|
%debug_package
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
unset QTDIR QTINC QTLIB
|
||||||
|
export PATH="%{tde_bindir}:${PATH}"
|
||||||
|
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
|
||||||
|
|
||||||
|
if ! rpm -E %%cmake|grep -q "cd build"; then
|
||||||
|
%__mkdir_p build
|
||||||
|
cd build
|
||||||
|
fi
|
||||||
|
|
||||||
|
%cmake \
|
||||||
|
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
|
||||||
|
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
|
||||||
|
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
|
||||||
|
-DCMAKE_SKIP_RPATH=OFF \
|
||||||
|
-DCMAKE_SKIP_INSTALL_RPATH=OFF \
|
||||||
|
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
|
||||||
|
-DCMAKE_VERBOSE_MAKEFILE=ON \
|
||||||
|
-DWITH_GCC_VISIBILITY=OFF \
|
||||||
|
\
|
||||||
|
-DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
|
||||||
|
-DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
|
||||||
|
-DLIB_INSTALL_DIR="%{tde_libdir}" \
|
||||||
|
\
|
||||||
|
-DWITH_ALL_OPTIONS=ON \
|
||||||
|
-DWITH_GCC_VISIBILITY=ON \
|
||||||
|
\
|
||||||
|
-DBUILD_ALL=ON \
|
||||||
|
-DBUILD_DOC=ON \
|
||||||
|
-DBUILD_TRANSLATIONS=ON \
|
||||||
|
..
|
||||||
|
|
||||||
|
%__make %{?_smp_mflags} || %__make
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
%__make install DESTDIR=%{buildroot} -C build
|
||||||
|
|
||||||
|
|
||||||
|
%clean
|
||||||
|
%__rm -rf %{?buildroot}
|
||||||
|
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc AUTHORS COPYING README.md
|
||||||
|
%{tde_tdelibdir}/tdeio_appinfo.la
|
||||||
|
%{tde_tdelibdir}/tdeio_appinfo.so
|
||||||
|
%{tde_datadir}/services/appinfo.protocol
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
@ -0,0 +1,100 @@
|
|||||||
|
FROM rockylinux:9
|
||||||
|
|
||||||
|
ARG TDE_VERSION=14.1.0
|
||||||
|
ARG ARCH=x86_64
|
||||||
|
|
||||||
|
# Enable proxy
|
||||||
|
# Install OVL plugin for DNF
|
||||||
|
# Update distribution packages
|
||||||
|
# Add EPEL repository
|
||||||
|
# Add RPMFUSION repository
|
||||||
|
# Enable supplementary repositories
|
||||||
|
# Install Trinity build dependencies
|
||||||
|
COPY packages /packages
|
||||||
|
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
|
||||||
|
&& curl -o /usr/lib/python3.9/site-packages/dnf-plugins/ovl.py https://raw.githubusercontent.com/FlorianLudwig/dnf-plugin-ovl/master/ovl.py \
|
||||||
|
&& dnf -y update \
|
||||||
|
&& dnf -y install epel-release \
|
||||||
|
&& dnf -y install https://download1.rpmfusion.org/free/el/updates/9/x86_64/r/rpmfusion-free-release-9-1.noarch.rpm \
|
||||||
|
&& dnf -y install dnf-plugins-core \
|
||||||
|
&& dnf config-manager --enable devel \
|
||||||
|
&& dnf config-manager --enable plus \
|
||||||
|
&& dnf -y --enableplugin=ovl install $(</packages)
|
||||||
|
|
||||||
|
# Add YUM repository for locally built packages
|
||||||
|
WORKDIR /etc/yum.repos.d
|
||||||
|
COPY rpmbuild.repo rpmbuild.repo
|
||||||
|
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
|
||||||
|
|
||||||
|
# Fix utempter detection
|
||||||
|
RUN chmod a+r /usr/libexec/utempter/utempter
|
||||||
|
|
||||||
|
# Add non-root user to build packages
|
||||||
|
RUN useradd -m -s /bin/bash -u 1000 trinity \
|
||||||
|
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
|
||||||
|
|
||||||
|
USER trinity
|
||||||
|
COPY rpmmacros /home/trinity/.rpmmacros
|
||||||
|
|
||||||
|
# Build supplementary development tools
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/gnuchess-6.2.9-3.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-6*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link-{devel,libs}-0*.rpm
|
||||||
|
|
||||||
|
RUN sudo rpm -Uvh \
|
||||||
|
http://rpms.remirepo.net/enterprise/9/remi/x86_64/libicu69-69.1-4.el9.remi.x86_64.rpm \
|
||||||
|
http://rpms.remirepo.net/enterprise/9/remi/x86_64/libyaz{,-devel}-5.32.0-1.el9.remi.x86_64.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-1.017-5.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-Getopt-ArgvFile-1.11-37.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/perl-PAR-Packer-1.054-3.fc36.src.rpm --nocheck \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/b/bdftopcf-1.1-4.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/bdftopcf-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/paper-2.3-4.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/paper-2*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/psutils-2.07-2.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/psutils-2*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/v/vorbis-tools-1.4.2-4.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/vorbis-tools-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/s/sword-1.9.0-9.fc36.src.rpm --undefine "__cmake_in_source_build" \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/c/chmlib-0.40-26.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/chmlib{,-devel}-0*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/h/html2ps-1.0-0.42.b7.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/html2ps-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libxml++-2.42.1-3.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libxml++{,-devel}-2*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libofx-0.10.3-2.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libofx{,-devel}-0*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-GeoLite-data-2018.06-9.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP-GeoLite-data-2*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/g/GeoIP-1.6.12-11.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/GeoIP{,-devel}-1*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/liblo-0.31-5.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/liblo{,-devel}-0*.rpm
|
||||||
|
|
||||||
|
RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm
|
||||||
@ -0,0 +1,218 @@
|
|||||||
|
alsa-lib-devel
|
||||||
|
aspell
|
||||||
|
aspell-devel
|
||||||
|
audiofile-devel
|
||||||
|
autotrace
|
||||||
|
avahi-devel
|
||||||
|
bind-devel
|
||||||
|
binutils-devel
|
||||||
|
bison
|
||||||
|
bluez-libs-devel
|
||||||
|
boost-devel
|
||||||
|
boost-python3-devel
|
||||||
|
byacc
|
||||||
|
bzip2-devel
|
||||||
|
cdparanoia
|
||||||
|
cdparanoia-devel
|
||||||
|
chrpath
|
||||||
|
clamav
|
||||||
|
clamav-devel
|
||||||
|
cln-devel
|
||||||
|
clucene-core-devel
|
||||||
|
cmake
|
||||||
|
cpp
|
||||||
|
cppunit-devel
|
||||||
|
crda
|
||||||
|
createrepo_c
|
||||||
|
cryptsetup-devel
|
||||||
|
cups-devel
|
||||||
|
dbus-glib-devel
|
||||||
|
docbook2X
|
||||||
|
doxygen
|
||||||
|
emacs
|
||||||
|
esound-devel
|
||||||
|
exempi-devel
|
||||||
|
exiv2-devel
|
||||||
|
fdupes
|
||||||
|
ffmpeg-devel
|
||||||
|
fftw-devel
|
||||||
|
file-devel
|
||||||
|
flac-devel
|
||||||
|
flex-devel
|
||||||
|
fontforge
|
||||||
|
fontpackages-devel
|
||||||
|
fribidi-devel
|
||||||
|
gcc
|
||||||
|
gcc-c++
|
||||||
|
gcc-gfortran
|
||||||
|
gettext-devel
|
||||||
|
giflib-devel
|
||||||
|
glibmm24-devel
|
||||||
|
gmp-devel
|
||||||
|
gnulib-devel
|
||||||
|
gperf
|
||||||
|
gpgme-devel
|
||||||
|
gphoto2-devel
|
||||||
|
GraphicsMagick-devel
|
||||||
|
gsl-devel
|
||||||
|
gstreamer1-devel
|
||||||
|
gstreamer1-plugins-base-devel
|
||||||
|
gtk2-devel
|
||||||
|
gtk3-devel
|
||||||
|
gtk-doc
|
||||||
|
help2man
|
||||||
|
hiredis
|
||||||
|
hspell-devel
|
||||||
|
iceauth
|
||||||
|
icu
|
||||||
|
ImageMagick-devel
|
||||||
|
imake
|
||||||
|
imlib2-devel
|
||||||
|
intltool
|
||||||
|
jack-audio-connection-kit-devel
|
||||||
|
jasper-devel
|
||||||
|
java-1.8.0-openjdk-devel
|
||||||
|
java-devel
|
||||||
|
java-openjdk
|
||||||
|
kernel
|
||||||
|
lame-devel
|
||||||
|
libacl-devel
|
||||||
|
libao-devel
|
||||||
|
libarchive-devel
|
||||||
|
libassuan-devel
|
||||||
|
libblkid-devel
|
||||||
|
libcap-devel
|
||||||
|
libcdio-devel
|
||||||
|
libcdio-paranoia-devel
|
||||||
|
libconfig-devel
|
||||||
|
libcurl-devel
|
||||||
|
libdb-devel
|
||||||
|
libdb-cxx-devel
|
||||||
|
libdvdread-devel
|
||||||
|
libfontenc-devel
|
||||||
|
libgsf-devel
|
||||||
|
libical-devel
|
||||||
|
libidn-devel
|
||||||
|
libjpeg-turbo-utils
|
||||||
|
libksba-devel
|
||||||
|
libmad-devel
|
||||||
|
libmemcached-devel
|
||||||
|
libmng-devel
|
||||||
|
libmpcdec-devel
|
||||||
|
libmtp-devel
|
||||||
|
libnsl2-devel
|
||||||
|
libogg-devel
|
||||||
|
libotr-devel
|
||||||
|
libpaper-devel
|
||||||
|
libpcap-devel
|
||||||
|
libqalculate-devel
|
||||||
|
libraw1394-devel
|
||||||
|
librsvg2-tools
|
||||||
|
librsync-devel
|
||||||
|
libsamplerate-devel
|
||||||
|
libsecret-devel
|
||||||
|
libsmbclient-devel
|
||||||
|
libsndfile-devel
|
||||||
|
libssh-devel
|
||||||
|
libtheora-devel
|
||||||
|
libtiff-devel
|
||||||
|
libtirpc-devel
|
||||||
|
libtool
|
||||||
|
libtool-ltdl-devel
|
||||||
|
libutempter-devel
|
||||||
|
libuuid-devel
|
||||||
|
libv4l-devel
|
||||||
|
libvisual-devel
|
||||||
|
libvorbis-devel
|
||||||
|
libwmf-devel
|
||||||
|
libwpd-devel
|
||||||
|
libXaw-devel
|
||||||
|
libXcomposite-devel
|
||||||
|
libXdamage-devel
|
||||||
|
libXdmcp-devel
|
||||||
|
libxkbfile-devel
|
||||||
|
libXScrnSaver-devel
|
||||||
|
libxslt-devel
|
||||||
|
libXtst-devel
|
||||||
|
libXv-devel
|
||||||
|
libXxf86dga-devel
|
||||||
|
libXxf86vm-devel
|
||||||
|
libudisks2-devel
|
||||||
|
libusb-devel
|
||||||
|
lirc-devel
|
||||||
|
lm_sensors-devel
|
||||||
|
mesa-libGL-devel
|
||||||
|
meson
|
||||||
|
mysql-devel
|
||||||
|
neon-devel
|
||||||
|
netpbm-progs
|
||||||
|
NetworkManager-libnm-devel
|
||||||
|
net-snmp-devel
|
||||||
|
net-tools
|
||||||
|
nspr-devel
|
||||||
|
ocaml
|
||||||
|
ocaml(compiler)
|
||||||
|
OpenEXR-devel
|
||||||
|
openldap-devel
|
||||||
|
opensc
|
||||||
|
opensp-devel
|
||||||
|
pam-devel
|
||||||
|
pciutils-devel
|
||||||
|
pcre-devel
|
||||||
|
pcsc-lite-devel
|
||||||
|
perl
|
||||||
|
perl-devel
|
||||||
|
perl-generators
|
||||||
|
perl(ExtUtils::MakeMaker)
|
||||||
|
perl(inc::Module::Install)
|
||||||
|
perl(IPC::Run3)
|
||||||
|
perl(PAR::Dist)
|
||||||
|
perl(Module::Signature)
|
||||||
|
perl(Test::Pod)
|
||||||
|
perl(Test::Pod::Coverage)
|
||||||
|
perl(XML::Parser)
|
||||||
|
pigz
|
||||||
|
pkcs11-helper-devel
|
||||||
|
polkit-devel
|
||||||
|
poppler-devel
|
||||||
|
postgresql
|
||||||
|
postgresql-devel
|
||||||
|
ppp
|
||||||
|
pulseaudio-libs-devel
|
||||||
|
python3
|
||||||
|
python3-devel
|
||||||
|
python3-pyxattr
|
||||||
|
rdesktop
|
||||||
|
rdiff-backup
|
||||||
|
readline-devel
|
||||||
|
recode
|
||||||
|
redhat-rpm-config
|
||||||
|
redis
|
||||||
|
rpcgen
|
||||||
|
rpm-build
|
||||||
|
ruby
|
||||||
|
ruby-devel
|
||||||
|
sane-backends-devel
|
||||||
|
SDL-devel
|
||||||
|
selinux-policy-devel
|
||||||
|
speex-devel
|
||||||
|
sqlite-devel
|
||||||
|
subversion-devel
|
||||||
|
sudo
|
||||||
|
swig
|
||||||
|
systemd-devel
|
||||||
|
taglib-devel
|
||||||
|
tcl
|
||||||
|
texinfo
|
||||||
|
texlive-collection-basic
|
||||||
|
torsocks
|
||||||
|
transfig
|
||||||
|
unixODBC-devel
|
||||||
|
usbutils
|
||||||
|
valgrind
|
||||||
|
wget
|
||||||
|
xine-lib-devel
|
||||||
|
xmlto
|
||||||
|
xorg-x11-server-utils
|
||||||
|
xorg-x11-util-macros
|
||||||
|
xz-devel
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
[rpmbuild.${ARCH}]
|
||||||
|
name=rpmbuild.${ARCH}
|
||||||
|
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[rpmbuild.noarch]
|
||||||
|
name=rpmbuild.noarch
|
||||||
|
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
%dist .el9
|
||||||
|
%_smp_mflags -j8
|
||||||
|
%jobs 8
|
||||||
|
%__cmake_in_source_build 1
|
||||||
|
%_debugsource_packages %nil
|
||||||
|
%_debugsource_template %nil
|
||||||
@ -1,6 +1,7 @@
|
|||||||
%dist .fc36
|
%dist .fc36
|
||||||
%_smp_mflags -j8
|
%_smp_mflags -j8
|
||||||
%jobs 8
|
%jobs 8
|
||||||
|
%__brp_remove_la_files %nil
|
||||||
%__cmake_builddir %nil
|
%__cmake_builddir %nil
|
||||||
%_debugsource_packages %nil
|
%_debugsource_packages %nil
|
||||||
%_debugsource_template %nil
|
%_debugsource_template %nil
|
||||||
|
|||||||
@ -0,0 +1,47 @@
|
|||||||
|
FROM fedora:37
|
||||||
|
|
||||||
|
ARG TDE_VERSION=14.1.0
|
||||||
|
ARG ARCH=x86_64
|
||||||
|
|
||||||
|
# Fix DNF database corruption
|
||||||
|
# Add RPMFUSION repository
|
||||||
|
# Install Trinity build dependencies
|
||||||
|
COPY packages /packages
|
||||||
|
RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \
|
||||||
|
&& rm -fv /etc/yum.repos.d/*{rawhide,testing}* \
|
||||||
|
&& sed -i /etc/yum.repos.d/fedora{,-modular,-updates,-updates-modular}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|37|g" \
|
||||||
|
&& dnf -y install dnf-plugin-ovl findutils \
|
||||||
|
&& dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-37.noarch.rpm \
|
||||||
|
&& dnf -y --enableplugin=ovl update \
|
||||||
|
&& dnf -y --enableplugin=ovl install --skip-broken $(</packages)
|
||||||
|
|
||||||
|
# Add YUM repository for locally built packages
|
||||||
|
COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo
|
||||||
|
RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
|
||||||
|
|
||||||
|
# Fix utempter detection
|
||||||
|
RUN chmod a+r /usr/libexec/utempter/utempter \
|
||||||
|
&& chmod 777 /tmp
|
||||||
|
|
||||||
|
# Add non-root user to build packages
|
||||||
|
RUN useradd -m -s /bin/bash -u 1000 trinity \
|
||||||
|
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \
|
||||||
|
&& echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc
|
||||||
|
|
||||||
|
USER trinity
|
||||||
|
COPY rpmmacros /home/trinity/.rpmmacros
|
||||||
|
|
||||||
|
RUN sudo rpm -Uvh https://download-ib01.fedoraproject.org/pub/fedora/linux/releases/34/Everything/aarch64/os/Packages/p/python2-setuptools-41.2.0-4.fc34.noarch.rpm
|
||||||
|
|
||||||
|
RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/34/Everything/source/tree/Packages/p/python-exif-2.3.2-2.fc34.src.rpm \
|
||||||
|
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-*
|
||||||
|
|
||||||
|
RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \
|
||||||
|
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29*
|
||||||
|
|
||||||
|
RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \
|
||||||
|
&& sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \
|
||||||
|
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \
|
||||||
|
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2*
|
||||||
@ -0,0 +1,240 @@
|
|||||||
|
alsa-lib-devel
|
||||||
|
aspell
|
||||||
|
aspell-devel
|
||||||
|
audiofile-devel
|
||||||
|
autotrace
|
||||||
|
avahi-devel
|
||||||
|
bdftopcf
|
||||||
|
bind-devel
|
||||||
|
binutils-devel
|
||||||
|
bison
|
||||||
|
boost-devel
|
||||||
|
boost-python3-devel
|
||||||
|
byacc
|
||||||
|
bzip2-devel
|
||||||
|
ccache
|
||||||
|
cdparanoia
|
||||||
|
cdparanoia-devel
|
||||||
|
chmlib-devel
|
||||||
|
chrpath
|
||||||
|
clamav
|
||||||
|
clamav-devel
|
||||||
|
clucene-core-devel
|
||||||
|
cmake
|
||||||
|
cpp
|
||||||
|
cppunit-devel
|
||||||
|
crda
|
||||||
|
createrepo_c
|
||||||
|
cryptsetup-devel
|
||||||
|
cups-devel
|
||||||
|
dbus-glib-devel
|
||||||
|
djvulibre
|
||||||
|
djvulibre-devel
|
||||||
|
dnf-plugin-ovl
|
||||||
|
docbook2X
|
||||||
|
doxygen
|
||||||
|
dssi-devel
|
||||||
|
esound-devel
|
||||||
|
exempi-devel
|
||||||
|
exiv2-devel
|
||||||
|
fdupes
|
||||||
|
fedora-rpm-macros
|
||||||
|
ffmpeg-devel
|
||||||
|
fftw-devel
|
||||||
|
file-devel
|
||||||
|
flac-devel
|
||||||
|
flex-static
|
||||||
|
fontpackages-devel
|
||||||
|
fribidi-devel
|
||||||
|
gcc
|
||||||
|
gcc-c++
|
||||||
|
geoip-devel
|
||||||
|
gettext-devel
|
||||||
|
giflib-devel
|
||||||
|
glib-devel
|
||||||
|
gmime-devel
|
||||||
|
gmp-devel
|
||||||
|
gnokii-devel
|
||||||
|
gperf
|
||||||
|
gpgme-devel
|
||||||
|
gphoto2-devel
|
||||||
|
GraphicsMagick-devel
|
||||||
|
graphviz
|
||||||
|
gsl-devel
|
||||||
|
gstreamer1-devel
|
||||||
|
gstreamer1-plugins-base-devel
|
||||||
|
gtk2-devel
|
||||||
|
gtk3-devel
|
||||||
|
gtk+-devel
|
||||||
|
gtk-doc
|
||||||
|
guile-devel
|
||||||
|
harfbuzz-devel
|
||||||
|
hspell-devel
|
||||||
|
htdig
|
||||||
|
html2ps
|
||||||
|
iceauth
|
||||||
|
icu
|
||||||
|
ImageMagick-devel
|
||||||
|
imake
|
||||||
|
imlib2-devel
|
||||||
|
intltool
|
||||||
|
jack-audio-connection-kit-devel
|
||||||
|
jasper-devel
|
||||||
|
java-1.8.0-openjdk-devel
|
||||||
|
java-devel
|
||||||
|
java-openjdk
|
||||||
|
lame-devel
|
||||||
|
lcms-devel
|
||||||
|
libacl-devel
|
||||||
|
libblkid-devel
|
||||||
|
libcap-devel
|
||||||
|
libcdio-devel
|
||||||
|
libcdio-paranoia-devel
|
||||||
|
libconfig-devel
|
||||||
|
libcurl-devel
|
||||||
|
libdb-cxx-devel
|
||||||
|
libdb-devel
|
||||||
|
libdvdread-devel
|
||||||
|
libfontenc-devel
|
||||||
|
libgadu-devel
|
||||||
|
libgpod-devel
|
||||||
|
libgsf-devel
|
||||||
|
libical-devel
|
||||||
|
libidn-devel
|
||||||
|
libifp-devel
|
||||||
|
liblo-devel
|
||||||
|
liblrdf-devel
|
||||||
|
libmad-devel
|
||||||
|
libmng-devel
|
||||||
|
libmp4v2-devel
|
||||||
|
libmpcdec-devel
|
||||||
|
libmtp-devel
|
||||||
|
libmusicbrainz5-devel
|
||||||
|
libnjb-devel
|
||||||
|
libnsl2-devel
|
||||||
|
libofx-devel
|
||||||
|
libogg-devel
|
||||||
|
libotr-devel
|
||||||
|
libpaper-devel
|
||||||
|
libpqxx-devel
|
||||||
|
libqalculate-devel
|
||||||
|
libraw1394-devel
|
||||||
|
librsvg2
|
||||||
|
librsvg2-tools
|
||||||
|
libsamplerate-devel
|
||||||
|
libsmbclient-devel
|
||||||
|
libsndfile-devel
|
||||||
|
libssh-devel
|
||||||
|
libssh2-devel
|
||||||
|
libtheora-devel
|
||||||
|
libtiff-devel
|
||||||
|
libtirpc-devel
|
||||||
|
libtool
|
||||||
|
libtool-ltdl-devel
|
||||||
|
libudev-devel
|
||||||
|
libudisks2-devel
|
||||||
|
libusb-compat-0.1-devel
|
||||||
|
libusb1-devel
|
||||||
|
libutempter-devel
|
||||||
|
libuuid-devel
|
||||||
|
libv4l-devel
|
||||||
|
libvisual-devel
|
||||||
|
libvncserver-devel
|
||||||
|
libvorbis-devel
|
||||||
|
libwmf-devel
|
||||||
|
libwpd-devel
|
||||||
|
libXaw-devel
|
||||||
|
libXcomposite-devel
|
||||||
|
libXdamage-devel
|
||||||
|
libXdmcp-devel
|
||||||
|
libxkbfile-devel
|
||||||
|
libXScrnSaver-devel
|
||||||
|
libxslt-devel
|
||||||
|
libXtst-devel
|
||||||
|
libXv-devel
|
||||||
|
libXxf86dga-devel
|
||||||
|
libXxf86vm-devel
|
||||||
|
libyaz-devel
|
||||||
|
libzrtpcpp-devel
|
||||||
|
lirc-devel
|
||||||
|
lm_sensors-devel
|
||||||
|
meanwhile-devel
|
||||||
|
mesa-libGL-devel
|
||||||
|
mftrace
|
||||||
|
mysql-devel
|
||||||
|
nas-devel
|
||||||
|
neon-devel
|
||||||
|
netpbm-progs
|
||||||
|
NetworkManager-libnm-devel
|
||||||
|
net-snmp-devel
|
||||||
|
net-tools
|
||||||
|
nspr-devel
|
||||||
|
ocaml
|
||||||
|
ocaml(compiler)
|
||||||
|
ocaml-facile-devel
|
||||||
|
OpenEXR-devel
|
||||||
|
openldap-devel
|
||||||
|
opensc
|
||||||
|
openslp-devel
|
||||||
|
opensp-devel
|
||||||
|
ortp-devel
|
||||||
|
pam-devel
|
||||||
|
pciutils-devel
|
||||||
|
pcre-devel
|
||||||
|
pcsc-lite-devel
|
||||||
|
pcsc-perl
|
||||||
|
perl
|
||||||
|
perl-devel
|
||||||
|
perl(ExtUtils::MakeMaker)
|
||||||
|
perl(PAR::Packer)
|
||||||
|
perl(XML::Parser)
|
||||||
|
pilot-link-devel
|
||||||
|
pkcs11-helper-devel
|
||||||
|
pkgconfig(pygtk-2.0)
|
||||||
|
polkit-devel
|
||||||
|
poppler-devel
|
||||||
|
postgresql
|
||||||
|
postgresql-devel
|
||||||
|
postgresql-private-devel
|
||||||
|
postgresql-server-devel
|
||||||
|
ppp
|
||||||
|
pulseaudio-libs-devel
|
||||||
|
python
|
||||||
|
python3-devel
|
||||||
|
qt4-devel
|
||||||
|
recode
|
||||||
|
redhat-rpm-config
|
||||||
|
rpcgen
|
||||||
|
rpm-build
|
||||||
|
ruby
|
||||||
|
ruby-devel
|
||||||
|
sane-backends-devel
|
||||||
|
scons
|
||||||
|
SDL-devel
|
||||||
|
selinux-policy-devel
|
||||||
|
speex-devel
|
||||||
|
sqlite-devel
|
||||||
|
subversion-devel
|
||||||
|
sudo
|
||||||
|
swig
|
||||||
|
sword-devel
|
||||||
|
t1lib-devel
|
||||||
|
t1utils
|
||||||
|
taglib-devel
|
||||||
|
texinfo
|
||||||
|
texlive-newunicodechar
|
||||||
|
torsocks
|
||||||
|
transfig
|
||||||
|
udisks-devel
|
||||||
|
unixODBC-devel
|
||||||
|
usbutils
|
||||||
|
valgrind
|
||||||
|
xbase-devel
|
||||||
|
xine-lib-devel
|
||||||
|
xmedcon
|
||||||
|
xmedcon-devel
|
||||||
|
xmlto
|
||||||
|
xorg-x11-font-utils
|
||||||
|
xscreensaver
|
||||||
|
xscreensaver-extras
|
||||||
|
xz-devel
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
[rpmbuild.${ARCH}]
|
||||||
|
name=rpmbuild.${ARCH}
|
||||||
|
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH}
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
|
|
||||||
|
[rpmbuild.noarch]
|
||||||
|
name=rpmbuild.noarch
|
||||||
|
baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
||||||
@ -0,0 +1,9 @@
|
|||||||
|
%dist .fc37
|
||||||
|
%_smp_mflags -j8
|
||||||
|
%jobs 8
|
||||||
|
%__brp_remove_la_files %nil
|
||||||
|
%__cmake_builddir %nil
|
||||||
|
%__cmake_in_source_build 1
|
||||||
|
%_debugsource_packages %nil
|
||||||
|
%_debugsource_template %nil
|
||||||
|
%source_date_epoch_from_changelog 0
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
--- htdig-3.2.0b6.orig/htdig/Parsable.cc
|
||||||
|
+++ htdig-3.2.0b6/htdig/Parsable.cc
|
||||||
|
@@ -74,7 +74,6 @@ Parsable::addString(Retriever& retriever
|
||||||
|
retriever.got_word(w, wordindex++, slot); // slot for img_alt
|
||||||
|
w = HtWordToken(0);
|
||||||
|
}
|
||||||
|
- w = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
//*****************************************************************************
|
||||||
|
@@ -92,5 +91,4 @@ Parsable::addKeywordString(Retriever& re
|
||||||
|
retriever.got_word(w, wordindex++, 9);
|
||||||
|
w = HtWordToken(0);
|
||||||
|
}
|
||||||
|
- w = '\0';
|
||||||
|
}
|
||||||
@ -0,0 +1,370 @@
|
|||||||
|
Index: b/htword/WordBitCompress.cc
|
||||||
|
===================================================================
|
||||||
|
--- a/htword/WordBitCompress.cc
|
||||||
|
+++ b/htword/WordBitCompress.cc
|
||||||
|
@@ -29,7 +29,7 @@
|
||||||
|
#include"WordBitCompress.h"
|
||||||
|
|
||||||
|
// ******** HtVector_byte (implementation)
|
||||||
|
-#define GType byte
|
||||||
|
+#define GType byte_t
|
||||||
|
#define HtVectorGType HtVector_byte
|
||||||
|
#include "HtVectorGenericCode.h"
|
||||||
|
|
||||||
|
@@ -424,13 +424,13 @@
|
||||||
|
// **************************************************
|
||||||
|
|
||||||
|
void
|
||||||
|
-BitStream::put_zone(byte *vals,int n,const char *tag)
|
||||||
|
+BitStream::put_zone(byte_t *vals,int n,const char *tag)
|
||||||
|
{
|
||||||
|
add_tag(tag);
|
||||||
|
for(int i=0;i<(n+7)/8;i++){put_uint(vals[i],TMin(8,n-8*i),NULL);}
|
||||||
|
}
|
||||||
|
void
|
||||||
|
-BitStream::get_zone(byte *vals,int n,const char *tag)
|
||||||
|
+BitStream::get_zone(byte_t *vals,int n,const char *tag)
|
||||||
|
{
|
||||||
|
check_tag(tag);
|
||||||
|
for(int i=0;i<(n+7)/8;i++){vals[i]=get_uint(TMin(8,n-8*i));}
|
||||||
|
@@ -699,16 +699,16 @@
|
||||||
|
if(all){printf("\n");}
|
||||||
|
|
||||||
|
}
|
||||||
|
-byte *
|
||||||
|
+byte_t *
|
||||||
|
BitStream::get_data()
|
||||||
|
{
|
||||||
|
- byte *res=(byte *)malloc(buff.size());
|
||||||
|
+ byte_t *res=(byte_t *)malloc(buff.size());
|
||||||
|
CHECK_MEM(res);
|
||||||
|
for(int i=0;i<buff.size();i++){res[i]=buff[i];}
|
||||||
|
return(res);
|
||||||
|
}
|
||||||
|
void
|
||||||
|
-BitStream::set_data(const byte *nbuff,int nbits)
|
||||||
|
+BitStream::set_data(const byte_t *nbuff,int nbits)
|
||||||
|
{
|
||||||
|
if(buff.size()!=1 || bitpos!=0)
|
||||||
|
{
|
||||||
|
@@ -835,7 +835,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
-Compressor::put_fixedbitl(byte *vals,int n,const char *tag)
|
||||||
|
+Compressor::put_fixedbitl(byte_t *vals,int n,const char *tag)
|
||||||
|
{
|
||||||
|
int cpos=bitpos;
|
||||||
|
int i,j;
|
||||||
|
@@ -844,19 +844,19 @@
|
||||||
|
put_uint_vl(n,NBITS_NVALS,"size");
|
||||||
|
if(n==0){return 0;}
|
||||||
|
|
||||||
|
- byte maxv=vals[0];
|
||||||
|
+ byte_t maxv=vals[0];
|
||||||
|
for(i=1;i<n;i++)
|
||||||
|
{
|
||||||
|
- byte v=vals[i];
|
||||||
|
+ byte_t v=vals[i];
|
||||||
|
if(v>maxv){maxv=v;}
|
||||||
|
}
|
||||||
|
int nbits=num_bits(maxv);
|
||||||
|
- if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte *) : overflow: nvals>2^16");}
|
||||||
|
+ if(n>=pow2(NBITS_NVALS)){errr("Compressor::put_fixedbitl(byte_t *) : overflow: nvals>2^16");}
|
||||||
|
put_uint(nbits,NBITS_NBITS_CHARVAL,"nbits");
|
||||||
|
add_tag("data");
|
||||||
|
for(i=0;i<n;i++)
|
||||||
|
{
|
||||||
|
- byte v=vals[i];
|
||||||
|
+ byte_t v=vals[i];
|
||||||
|
for(j=0;j<nbits;j++) {put(v&pow2(j));}
|
||||||
|
}
|
||||||
|
return(bitpos-cpos);
|
||||||
|
@@ -887,15 +887,15 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
int
|
||||||
|
-Compressor::get_fixedbitl(byte **pres,const char *tag/*="BADTAG!"*/)
|
||||||
|
+Compressor::get_fixedbitl(byte_t **pres,const char *tag/*="BADTAG!"*/)
|
||||||
|
{
|
||||||
|
- if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte *): check_tag failed");}
|
||||||
|
+ if(check_tag(tag)==NOTOK){errr("Compressor::get_fixedbitl(byte_t *): check_tag failed");}
|
||||||
|
int n=get_uint_vl(NBITS_NVALS);
|
||||||
|
if(!n){*pres=NULL;return 0;}
|
||||||
|
int nbits=get_uint(NBITS_NBITS_CHARVAL);
|
||||||
|
- if(verbose)printf("get_fixedbitl(byte):n%3d nbits:%2d\n",n,nbits);
|
||||||
|
+ if(verbose)printf("get_fixedbitl(byte_t):n%3d nbits:%2d\n",n,nbits);
|
||||||
|
int i;
|
||||||
|
- byte *res=new byte[n];
|
||||||
|
+ byte_t *res=new byte_t[n];
|
||||||
|
CHECK_MEM(res);
|
||||||
|
for(i=0;i<n;i++)
|
||||||
|
{
|
||||||
|
Index: b/htword/WordBitCompress.h
|
||||||
|
===================================================================
|
||||||
|
--- a/htword/WordBitCompress.h
|
||||||
|
+++ b/htword/WordBitCompress.h
|
||||||
|
@@ -28,9 +28,9 @@
|
||||||
|
#include"HtVector_int.h"
|
||||||
|
#include"HtMaxMin.h"
|
||||||
|
|
||||||
|
-typedef unsigned char byte;
|
||||||
|
+typedef unsigned char byte_t;
|
||||||
|
// ******** HtVector_byte (header)
|
||||||
|
-#define GType byte
|
||||||
|
+#define GType byte_t
|
||||||
|
#define HtVectorGType HtVector_byte
|
||||||
|
#include "HtVectorGeneric.h"
|
||||||
|
|
||||||
|
@@ -123,12 +123,12 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// gets a bit from the bitstream
|
||||||
|
- inline byte get(const char *tag=(char*)NULL)
|
||||||
|
+ inline byte_t get(const char *tag=(char*)NULL)
|
||||||
|
{
|
||||||
|
// SPEED CRITICAL SECTION
|
||||||
|
if(check_tag(tag)==NOTOK){errr("BitStream::get() check_tag failed");}
|
||||||
|
if(bitpos>=(buff.size()<<3)){errr("BitStream::get reading past end of BitStream!");}
|
||||||
|
- byte res=buff[bitpos>>3] & pow2(bitpos & 0x07);
|
||||||
|
+ byte_t res=buff[bitpos>>3] & pow2(bitpos & 0x07);
|
||||||
|
// printf("get:res:%d bitpos:%5d/%d buff[%3d]=%x\n",res,bitpos,bitpos%8,bitpos/8,buff[bitpos/8]);
|
||||||
|
bitpos++;
|
||||||
|
return(res);
|
||||||
|
@@ -139,8 +139,8 @@
|
||||||
|
unsigned int get_uint( int n,const char *tag=(char*)NULL);
|
||||||
|
|
||||||
|
// get/put n bits of data stored in vals
|
||||||
|
- void put_zone(byte *vals,int n,const char *tag);
|
||||||
|
- void get_zone(byte *vals,int n,const char *tag);
|
||||||
|
+ void put_zone(byte_t *vals,int n,const char *tag);
|
||||||
|
+ void get_zone(byte_t *vals,int n,const char *tag);
|
||||||
|
|
||||||
|
//
|
||||||
|
inline void add_tag(const char *tag)
|
||||||
|
@@ -167,9 +167,9 @@
|
||||||
|
int buffsize(){return(buff.size());}
|
||||||
|
|
||||||
|
// get a copy of the buffer
|
||||||
|
- byte *get_data();
|
||||||
|
+ byte_t *get_data();
|
||||||
|
// set the buffer from outside data (current buffer must be empty)
|
||||||
|
- void set_data(const byte *nbuff,int nbits);
|
||||||
|
+ void set_data(const byte_t *nbuff,int nbits);
|
||||||
|
|
||||||
|
// use this for reading a BitStream after you have written in it
|
||||||
|
// (generally for debuging)
|
||||||
|
@@ -211,7 +211,7 @@
|
||||||
|
#define NBITS_VAL 32
|
||||||
|
// number of bits to code he number of bits used by an unsigned int value
|
||||||
|
#define NBITS_NBITS_VAL 5
|
||||||
|
-// number of bits to code the number of bits used by a byte value
|
||||||
|
+// number of bits to code the number of bits used by a byte_t value
|
||||||
|
#define NBITS_NBITS_CHARVAL 4
|
||||||
|
|
||||||
|
class Compressor : public BitStream
|
||||||
|
@@ -240,8 +240,8 @@
|
||||||
|
int get_vals(unsigned int **pres,const char *tag=(char*)"BADTAG!");
|
||||||
|
|
||||||
|
// compress/decompress an array of bytes (very simple)
|
||||||
|
- int put_fixedbitl(byte *vals,int n,const char *tag);
|
||||||
|
- int get_fixedbitl(byte **pres,const char *tag=(char*)"BADTAG!");
|
||||||
|
+ int put_fixedbitl(byte_t *vals,int n,const char *tag);
|
||||||
|
+ int get_fixedbitl(byte_t **pres,const char *tag=(char*)"BADTAG!");
|
||||||
|
|
||||||
|
// compress/decompress an array of unsigned ints (very simple)
|
||||||
|
void get_fixedbitl(unsigned int *res,int n);
|
||||||
|
Index: b/htword/WordDBPage.cc
|
||||||
|
===================================================================
|
||||||
|
--- a/htword/WordDBPage.cc
|
||||||
|
+++ b/htword/WordDBPage.cc
|
||||||
|
@@ -155,7 +155,7 @@
|
||||||
|
Uncompress_main(pin);
|
||||||
|
break;
|
||||||
|
case CMPRTYPE_BADCOMPRESS:// this page did not compress correctly
|
||||||
|
- pin->get_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
|
||||||
|
+ pin->get_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
errr("WordDBPage::Uncompress: CMPRTYPE incoherent");
|
||||||
|
@@ -181,7 +181,7 @@
|
||||||
|
int *rnum_sizes=new int[nnums];
|
||||||
|
CHECK_MEM(rnum_sizes);
|
||||||
|
// char differences between words
|
||||||
|
- byte *rworddiffs=NULL;
|
||||||
|
+ byte_t *rworddiffs=NULL;
|
||||||
|
int nrworddiffs;
|
||||||
|
|
||||||
|
// *********** read header
|
||||||
|
@@ -288,7 +288,7 @@
|
||||||
|
return OK;
|
||||||
|
}
|
||||||
|
void
|
||||||
|
-WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
|
||||||
|
+WordDBPage::Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
|
||||||
|
{
|
||||||
|
int irwordiffs=0;
|
||||||
|
int nfields=WordKey::NFields();
|
||||||
|
@@ -405,7 +405,7 @@
|
||||||
|
|
||||||
|
// display
|
||||||
|
void
|
||||||
|
-WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte *rworddiffs,int nrworddiffs)
|
||||||
|
+WordDBPage::Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums0,byte_t *rworddiffs,int nrworddiffs)
|
||||||
|
{
|
||||||
|
int i,j;
|
||||||
|
if(verbose)
|
||||||
|
@@ -464,7 +464,7 @@
|
||||||
|
res->put_uint(COMPRESS_VERSION,NBITS_COMPRESS_VERSION,"COMPRESS_VERSION");
|
||||||
|
res->put_uint(CMPRTYPE_BADCOMPRESS,NBITS_CMPRTYPE,"CMPRTYPE");
|
||||||
|
|
||||||
|
- res->put_zone((byte *)pg,pgsz*8,"INITIALBUFFER");
|
||||||
|
+ res->put_zone((byte_t *)pg,pgsz*8,"INITIALBUFFER");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(verbose)
|
||||||
|
@@ -761,7 +761,7 @@
|
||||||
|
printf("compare failed in some unknown place in header:\n");
|
||||||
|
for(i=0;i<(int)(sizeof(PAGE)-sizeof(db_indx_t));i++)
|
||||||
|
{
|
||||||
|
- printf("%3d: %3x %3x\n",i,((byte *)pg)[i],((byte *)other.pg)[i]);
|
||||||
|
+ printf("%3d: %3x %3x\n",i,((byte_t *)pg)[i],((byte_t *)other.pg)[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -998,7 +998,7 @@
|
||||||
|
printf("%5d: ",nn);
|
||||||
|
for(j=0;j<20;j++)
|
||||||
|
{
|
||||||
|
- printf("%2x ",((byte *)pg)[nn++]);
|
||||||
|
+ printf("%2x ",((byte_t *)pg)[nn++]);
|
||||||
|
if(nn>=pgsz){break;}
|
||||||
|
}
|
||||||
|
printf("\n");
|
||||||
|
Index: b/htword/WordDBPage.h
|
||||||
|
===================================================================
|
||||||
|
--- a/htword/WordDBPage.h
|
||||||
|
+++ b/htword/WordDBPage.h
|
||||||
|
@@ -65,7 +65,7 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
WordDBRecord():WordRecord(){;}
|
||||||
|
- WordDBRecord(byte *dat,int len,int rectyp):WordRecord()
|
||||||
|
+ WordDBRecord(byte_t *dat,int len,int rectyp):WordRecord()
|
||||||
|
{
|
||||||
|
type=(rectyp ? DefaultType() : WORD_RECORD_STATS);
|
||||||
|
Unpack(String((char *)dat,len));
|
||||||
|
@@ -118,7 +118,7 @@
|
||||||
|
}
|
||||||
|
else{Unpack(String((char *)nkey->data,nkey->len));}
|
||||||
|
}
|
||||||
|
- WordDBKey(byte *data,int len):WordKey()
|
||||||
|
+ WordDBKey(byte_t *data,int len):WordKey()
|
||||||
|
{
|
||||||
|
key=NULL;
|
||||||
|
if(!data || !len){errr("WordDBKey::WordDBKey(data,len) !data || !len");}
|
||||||
|
@@ -207,7 +207,7 @@
|
||||||
|
void *alloc_entry(int size)
|
||||||
|
{
|
||||||
|
size=WORD_ALIGN_TO(size,4);
|
||||||
|
- int inp_pos=((byte *)&(pg->inp[insert_indx]))-(byte *)pg;
|
||||||
|
+ int inp_pos=((byte_t *)&(pg->inp[insert_indx]))-(byte_t *)pg;
|
||||||
|
insert_pos-=size;
|
||||||
|
if(insert_pos<=inp_pos)
|
||||||
|
{
|
||||||
|
@@ -216,7 +216,7 @@
|
||||||
|
errr("WordDBPage::alloc_entry: PAGE OVERFLOW");
|
||||||
|
}
|
||||||
|
pg->inp[insert_indx++]=insert_pos;
|
||||||
|
- return((void *)((byte *)pg+insert_pos));
|
||||||
|
+ return((void *)((byte_t *)pg+insert_pos));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -260,11 +260,11 @@
|
||||||
|
ky.Pack(pkey);
|
||||||
|
keylen=pkey.length();
|
||||||
|
}
|
||||||
|
- int size=keylen+((byte *)&(bti.data))-((byte *)&bti);// pos of data field in BINTERNAL
|
||||||
|
+ int size=keylen+((byte_t *)&(bti.data))-((byte_t *)&bti);// pos of data field in BINTERNAL
|
||||||
|
if(empty)
|
||||||
|
{
|
||||||
|
if(verbose){printf("WordDBPage::insert_btikey: empty : BINTERNAL:%d datapos:%d keylen:%d size:%d alligned to:%d\n",(int)sizeof(BINTERNAL),
|
||||||
|
- (int)(((byte *)&(bti.data))-((byte *)&bti)),
|
||||||
|
+ (int)(((byte_t *)&(bti.data))-((byte_t *)&bti)),
|
||||||
|
keylen,size,WORD_ALIGN_TO(size,4));}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -306,8 +306,8 @@
|
||||||
|
int Uncompress_main(Compressor *pin);
|
||||||
|
void Uncompress_vals_chaged_flags(Compressor &in,unsigned int **pcflags,int *pn);
|
||||||
|
int Uncompress_header(Compressor &in);
|
||||||
|
- void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
|
||||||
|
- void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte *rworddiffs,int nrworddiffs);
|
||||||
|
+ void Uncompress_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
|
||||||
|
+ void Uncompress_show_rebuild(unsigned int **rnums,int *rnum_sizes,int nnums,byte_t *rworddiffs,int nrworddiffs);
|
||||||
|
|
||||||
|
int TestCompress(int debuglevel);
|
||||||
|
int Compare(WordDBPage &other);
|
||||||
|
@@ -326,14 +326,14 @@
|
||||||
|
out.put_uint(btikey(i)->type ,sizeof(btikey(i)->type )*8,label_str("seperatekey_bti_type" ,i));
|
||||||
|
out.put_uint(btikey(i)->pgno ,sizeof(btikey(i)->pgno )*8,label_str("seperatekey_bti_pgno" ,i));
|
||||||
|
out.put_uint(btikey(i)->nrecs,sizeof(btikey(i)->nrecs)*8,label_str("seperatekey_bti_nrecs",i));
|
||||||
|
- if(len){out.put_zone((byte *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
|
||||||
|
+ if(len){out.put_zone((byte_t *)btikey(i)->data,8*len,label_str("seperatekey_btidata",i));}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int len=key(i)->len;
|
||||||
|
out.put_uint(len,NBITS_KEYLEN,label_str("seperatekey_len",i));
|
||||||
|
if(verbose){printf("WordDBPage::compress_key: compress(typ5):%d\n",len);}
|
||||||
|
- out.put_zone((byte *)key(i)->data,8*len,label_str("seperatekey_data",i));
|
||||||
|
+ out.put_zone((byte_t *)key(i)->data,8*len,label_str("seperatekey_data",i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void compress_data(Compressor &out,int i)
|
||||||
|
@@ -341,7 +341,7 @@
|
||||||
|
int len=data(i)->len;
|
||||||
|
out.put_uint(len,NBITS_DATALEN,label_str("seperatedata_len",i));
|
||||||
|
if(verbose){printf("WordDBPage::compress_data: compressdata(typ5):%d\n",len);}
|
||||||
|
- out.put_zone((byte *)data(i)->data,8*len,label_str("seperatedata_data",i));
|
||||||
|
+ out.put_zone((byte_t *)data(i)->data,8*len,label_str("seperatedata_data",i));
|
||||||
|
}
|
||||||
|
WordDBKey uncompress_key(Compressor &in,int i)
|
||||||
|
{
|
||||||
|
@@ -360,7 +360,7 @@
|
||||||
|
if(len!=bti.len){errr("WordDBPage::uncompress_key: incoherence: len!=bti.len");}
|
||||||
|
if(len)
|
||||||
|
{
|
||||||
|
- byte *gotdata=new byte[len];
|
||||||
|
+ byte_t *gotdata=new byte_t[len];
|
||||||
|
CHECK_MEM(gotdata);
|
||||||
|
in.get_zone(gotdata,8*len,label_str("seperatekey_btidata",i));
|
||||||
|
res=WordDBKey(gotdata,len);
|
||||||
|
@@ -370,7 +370,7 @@
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- byte *gotdata=new byte[len];
|
||||||
|
+ byte_t *gotdata=new byte_t[len];
|
||||||
|
CHECK_MEM(gotdata);
|
||||||
|
in.get_zone(gotdata,8*len,label_str("seperatekey_data",i));
|
||||||
|
res=WordDBKey(gotdata,len);
|
||||||
|
@@ -384,7 +384,7 @@
|
||||||
|
WordDBRecord res;
|
||||||
|
int len=in.get_uint(NBITS_DATALEN,label_str("seperatedata_len",i));
|
||||||
|
if(verbose)printf("uncompressdata:len:%d\n",len);
|
||||||
|
- byte *gotdata=new byte[len];
|
||||||
|
+ byte_t *gotdata=new byte_t[len];
|
||||||
|
CHECK_MEM(gotdata);
|
||||||
|
in.get_zone(gotdata,8*len,label_str("seperatedata_data",i));
|
||||||
|
res=WordDBRecord(gotdata,len,rectyp);
|
||||||
|
@@ -488,7 +488,7 @@
|
||||||
|
{
|
||||||
|
init0();
|
||||||
|
pgsz=npgsz;
|
||||||
|
- pg=(PAGE *)(new byte[pgsz]);
|
||||||
|
+ pg=(PAGE *)(new byte_t[pgsz]);
|
||||||
|
CHECK_MEM(pg);
|
||||||
|
insert_pos=pgsz;
|
||||||
|
insert_indx=0;
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
Description: Fix FTBFS with gcc-6.
|
||||||
|
--- htdig-3.2.0b6.orig/htfuzzy/Accents.cc
|
||||||
|
+++ htdig-3.2.0b6/htfuzzy/Accents.cc
|
||||||
|
@@ -43,7 +43,7 @@ extern int debug;
|
||||||
|
| table iso-latin1 "minusculisee" et "de-accentuee" |
|
||||||
|
`--------------------------------------------------*/
|
||||||
|
|
||||||
|
-static char MinusculeISOLAT1[256] = {
|
||||||
|
+static unsigned char MinusculeISOLAT1[256] = {
|
||||||
|
0, 1, 2, 3, 4, 5, 6, 7,
|
||||||
|
8, 9, 10, 11, 12, 13, 14, 15,
|
||||||
|
16, 17, 18, 19, 20, 21, 22, 23,
|
||||||
@ -0,0 +1,176 @@
|
|||||||
|
Description: complete diff against upstream of version 3.2.0b6
|
||||||
|
|
||||||
|
--- htdig-3.2.0b6.orig/db/os_rw.c
|
||||||
|
+++ htdig-3.2.0b6/db/os_rw.c
|
||||||
|
@@ -5,6 +5,13 @@
|
||||||
|
* Sleepycat Software. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#define _XOPEN_SOURCE 500
|
||||||
|
+#include <sys/types.h>
|
||||||
|
+#include <unistd.h>
|
||||||
|
+#ifndef u_long
|
||||||
|
+typedef __u_long u_long;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "db_config.h"
|
||||||
|
|
||||||
|
#ifndef lint
|
||||||
|
--- htdig-3.2.0b6.orig/htcommon/defaults.cc
|
||||||
|
+++ htdig-3.2.0b6/htcommon/defaults.cc
|
||||||
|
@@ -596,7 +596,7 @@
|
||||||
|
<a href=\"htfuzzy.html\">htfuzzy</a> for more information on the \
|
||||||
|
format of this file. \
|
||||||
|
" }, \
|
||||||
|
-{ "endings_root2word_db", "${common_dir}/root2word.db", \
|
||||||
|
+{ "endings_root2word_db", "${database_dir}/root2word.db", \
|
||||||
|
"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_root2word_db: /var/htdig/r2w.db", " \
|
||||||
|
This attributes specifies the database filename to be \
|
||||||
|
used in the 'endings' fuzzy search algorithm. The \
|
||||||
|
@@ -610,7 +610,7 @@
|
||||||
|
This is because this database can be shared with \
|
||||||
|
different search databases. \
|
||||||
|
" }, \
|
||||||
|
-{ "endings_word2root_db", "${common_dir}/word2root.db", \
|
||||||
|
+{ "endings_word2root_db", "${database_dir}/word2root.db", \
|
||||||
|
"string", "htfuzzy htsearch", "", "all", "File Layout", "endings_word2root_db: /var/htdig/w2r.bm", " \
|
||||||
|
This attributes specifies the database filename to be \
|
||||||
|
used in the 'endings' fuzzy search algorithm. The \
|
||||||
|
@@ -2426,7 +2426,7 @@
|
||||||
|
that this does not limit the number of documents that \
|
||||||
|
are matched in any way. \
|
||||||
|
" }, \
|
||||||
|
-{ "synonym_db", "${common_dir}/synonyms.db", \
|
||||||
|
+{ "synonym_db", "${database_dir}/synonyms.db", \
|
||||||
|
"string", "htsearch htfuzzy", "", "3.0", "File Layout", "synonym_db: ${database_base}.syn.db", " \
|
||||||
|
Points to the database that <a href=\"htfuzzy.html\"> \
|
||||||
|
htfuzzy</a> creates when the <strong>synonyms</strong> \
|
||||||
|
--- htdig-3.2.0b6.orig/htdig/Server.cc
|
||||||
|
+++ htdig-3.2.0b6/htdig/Server.cc
|
||||||
|
@@ -341,6 +341,8 @@
|
||||||
|
{
|
||||||
|
String fullpatt = "^[^:]*://[^/]*(";
|
||||||
|
fullpatt << pattern << ')';
|
||||||
|
+ if (pattern.length() == 0)
|
||||||
|
+ fullpatt = "";
|
||||||
|
_disallow.set(fullpatt, config->Boolean("case_sensitive"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- htdig-3.2.0b6.orig/htsearch/Collection.h
|
||||||
|
+++ htdig-3.2.0b6/htsearch/Collection.h
|
||||||
|
@@ -36,9 +36,9 @@
|
||||||
|
const char *docExcerpt);
|
||||||
|
~Collection();
|
||||||
|
|
||||||
|
- void Collection::Open();
|
||||||
|
+ void Open();
|
||||||
|
|
||||||
|
- void Collection::Close();
|
||||||
|
+ void Close();
|
||||||
|
|
||||||
|
char *getWordFile() { return wordFile.get(); }
|
||||||
|
DocumentRef *getDocumentRef(int id);
|
||||||
|
--- htdig-3.2.0b6.orig/htsearch/Display.cc
|
||||||
|
+++ htdig-3.2.0b6/htsearch/Display.cc
|
||||||
|
@@ -54,6 +54,7 @@
|
||||||
|
|
||||||
|
#include <math.h>
|
||||||
|
#include <float.h>
|
||||||
|
+#include <values.h>
|
||||||
|
|
||||||
|
#if !defined(DBL_MAX)
|
||||||
|
# if defined (MAXDOUBLE)
|
||||||
|
@@ -137,7 +138,7 @@
|
||||||
|
// Must temporarily stash the message in a String, since
|
||||||
|
// displaySyntaxError will overwrite the static temp used in form.
|
||||||
|
|
||||||
|
- String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
|
||||||
|
+ String s("Invalid sort method.");
|
||||||
|
|
||||||
|
displaySyntaxError(s);
|
||||||
|
return;
|
||||||
|
--- htdig-3.2.0b6.orig/htsearch/htsearch.cc
|
||||||
|
+++ htdig-3.2.0b6/htsearch/htsearch.cc
|
||||||
|
@@ -211,8 +211,7 @@
|
||||||
|
}
|
||||||
|
if (access((char*)configFile, R_OK) < 0)
|
||||||
|
{
|
||||||
|
- reportError(form("Unable to read configuration file '%s'",
|
||||||
|
- configFile.get()));
|
||||||
|
+ reportError("Unable to read configuration file");
|
||||||
|
}
|
||||||
|
config->Read(configFile);
|
||||||
|
|
||||||
|
--- htdig-3.2.0b6.orig/htsearch/qtest.cc
|
||||||
|
+++ htdig-3.2.0b6/htsearch/qtest.cc
|
||||||
|
@@ -132,8 +132,7 @@
|
||||||
|
|
||||||
|
if (access((char*)configFile, R_OK) < 0)
|
||||||
|
{
|
||||||
|
- reportError(form("Unable to find configuration file '%s'",
|
||||||
|
- configFile.get()));
|
||||||
|
+ reportError("Unable to find configuration file");
|
||||||
|
}
|
||||||
|
|
||||||
|
config->Read(configFile);
|
||||||
|
--- htdig-3.2.0b6.orig/htword/WordDBPage.cc
|
||||||
|
+++ htdig-3.2.0b6/htword/WordDBPage.cc
|
||||||
|
@@ -82,7 +82,7 @@
|
||||||
|
if(debuglevel>2)printf("TOTAL SIZE: %6d %8f\n",size,size/8.0);
|
||||||
|
// argh! compare failed somthing went wrong
|
||||||
|
// display the compress/decompress sequence and fail
|
||||||
|
- if(cmp || size>8*1024*1000000000)
|
||||||
|
+ if(cmp || size>8*1024)
|
||||||
|
{
|
||||||
|
if(size>8*1024)
|
||||||
|
{
|
||||||
|
--- htdig-3.2.0b6.orig/installdir/rundig
|
||||||
|
+++ htdig-3.2.0b6/installdir/rundig
|
||||||
|
@@ -7,17 +7,18 @@
|
||||||
|
#
|
||||||
|
# This is a sample script to create a search database for ht://Dig.
|
||||||
|
#
|
||||||
|
-DBDIR=@DATABASE_DIR@
|
||||||
|
-COMMONDIR=@COMMON_DIR@
|
||||||
|
-BINDIR=@BIN_DIR@
|
||||||
|
-conffile=@DEFAULT_CONFIG_FILE@
|
||||||
|
+DBDIR=/var/lib/htdig
|
||||||
|
+COMMONDIR=/etc/htdig
|
||||||
|
+BINDIR=/usr/bin
|
||||||
|
+conffile=/etc/htdig/htdig.conf
|
||||||
|
|
||||||
|
# To help debug problems, try running rundig -vvv
|
||||||
|
# This will add lots of debugging output to all of the programs
|
||||||
|
-stats= opts= alt=
|
||||||
|
+stats= opts= alt= nohtnotify=
|
||||||
|
while [ "$#" -gt 0 ]
|
||||||
|
do
|
||||||
|
case "$1" in
|
||||||
|
+ --no-htnotify) nohtnotify="true" ;;
|
||||||
|
-a) alt="$1" ;;
|
||||||
|
-s) stats="$1" ;;
|
||||||
|
-c) shift
|
||||||
|
@@ -65,7 +66,11 @@
|
||||||
|
test -f db.words.db.work_weakcmpr &&
|
||||||
|
mv -f db.words.db.work_weakcmpr db.words.db_weakcmpr) ;;
|
||||||
|
esac
|
||||||
|
-$BINDIR/htnotify $opts
|
||||||
|
+if [ "$nohtnotify" = "true" ]; then
|
||||||
|
+ echo "Skipping htnotify."
|
||||||
|
+else
|
||||||
|
+ $BINDIR/htnotify $opts
|
||||||
|
+fi
|
||||||
|
# If you want to use the soundex and (or) metaphone fuzzy matchings,
|
||||||
|
# Uncomment the following line
|
||||||
|
# $BINDIR/htfuzzy $opts soundex metaphone
|
||||||
|
--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
|
||||||
|
+++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
|
||||||
|
@@ -142,7 +142,7 @@
|
||||||
|
// Must temporarily stash the message in a String, since
|
||||||
|
// displaySyntaxError will overwrite the static temp used in form.
|
||||||
|
|
||||||
|
- String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
|
||||||
|
+ String s("Invalid search method.");
|
||||||
|
|
||||||
|
displaySyntaxError(s);
|
||||||
|
//return;
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
From: Steven Chamberlain <steven@pyro.eu.org>
|
||||||
|
Subject: only use ETIME if defined
|
||||||
|
Bug-Debian: http://bugs.debian.org/765284
|
||||||
|
Forwarded: no
|
||||||
|
|
||||||
|
ETIME relates to an optional POSIX STREAMS extension not implemented
|
||||||
|
on some platforms (such as GNU/kFreeBSD).
|
||||||
|
|
||||||
|
Don't check for this return value on platforms that don't define it.
|
||||||
|
|
||||||
|
--- htdig-3.2.0b6.orig/db/mut_pthread.c.orig 2002-02-02 18:18:05.000000000 +0000
|
||||||
|
+++ htdig-3.2.0b6/db/mut_pthread.c 2014-10-14 12:40:53.771737556 +0100
|
||||||
|
@@ -201,7 +201,11 @@
|
||||||
|
* call, and Solaris delivers the signal to the wrong
|
||||||
|
* LWP.
|
||||||
|
*/
|
||||||
|
- if (ret != 0 && ret != ETIME && ret != ETIMEDOUT)
|
||||||
|
+ if (ret != 0 &&
|
||||||
|
+#ifdef ETIME
|
||||||
|
+ ret != ETIME &&
|
||||||
|
+#endif
|
||||||
|
+ ret != ETIMEDOUT)
|
||||||
|
return (ret);
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,6 @@
|
|||||||
|
htdig_3.2.0b6-13.diff
|
||||||
|
kfreebsd
|
||||||
|
gcc-6
|
||||||
|
sourceforge_logo
|
||||||
|
drop-bogus-assignment
|
||||||
|
gcc-11
|
||||||
@ -0,0 +1,118 @@
|
|||||||
|
Description: don't remote-link SourceForge's logo
|
||||||
|
This let SourceForge track everyone who reads these docs. As the image is
|
||||||
|
not freely licensed, let's leave only a piece of text.
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/FAQ.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/FAQ.html
|
||||||
|
@@ -2585,6 +2585,6 @@ find /path/to/your/document/root -type f
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:16 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/author.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/author.html
|
||||||
|
@@ -34,6 +34,6 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:18 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/bugs.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/bugs.html
|
||||||
|
@@ -50,6 +50,6 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:18 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/isp.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/isp.html
|
||||||
|
@@ -81,7 +81,7 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:19 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/mailing.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/mailing.html
|
||||||
|
@@ -55,6 +55,6 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:19 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/main.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/main.html
|
||||||
|
@@ -103,6 +103,6 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:19 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/rundig.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/rundig.html
|
||||||
|
@@ -184,7 +184,7 @@
|
||||||
|
Last modified: $Date: 2004/06/12 13:39:13 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/running.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/running.html
|
||||||
|
@@ -131,7 +131,7 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:19 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/uses.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/uses.html
|
||||||
|
@@ -646,7 +646,7 @@
|
||||||
|
Last modified: $Date: 2004/05/28 13:15:19 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/htdoc/where.html
|
||||||
|
+++ htdig-3.2.0b6/htdoc/where.html
|
||||||
|
@@ -121,6 +121,6 @@
|
||||||
|
<br>
|
||||||
|
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
-<img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+SourceForge</a>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
--- htdig-3.2.0b6.orig/test/htdocs/set1/bad_local.htm
|
||||||
|
+++ htdig-3.2.0b6/test/htdocs/set1/bad_local.htm
|
||||||
|
@@ -51,7 +51,7 @@
|
||||||
|
Last modified: $Date: 2004/01/18 12:54:15 $
|
||||||
|
<br>
|
||||||
|
<a href="http://sourceforge.net/">
|
||||||
|
- <img src="http://sourceforge.net/sflogo.php?group_id=4593&type=1" width="88" height="31" border="0" alt="SourceForge Logo"></a>
|
||||||
|
+ SourceForge</a>
|
||||||
|
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
pamd.kcheckpass-trinity.el7
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
auth include system-auth
|
||||||
|
account include system-auth
|
||||||
|
password include system-auth
|
||||||
|
session include system-auth
|
||||||
@ -0,0 +1 @@
|
|||||||
|
pamd.kdm-trinity-np.el7
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
auth required pam_env.so
|
||||||
|
auth required pam_permit.so
|
||||||
|
auth include postlogin
|
||||||
|
account required pam_nologin.so
|
||||||
|
account include system-auth
|
||||||
|
password include system-auth
|
||||||
|
session required pam_selinux.so close
|
||||||
|
session required pam_loginuid.so
|
||||||
|
session optional pam_console.so
|
||||||
|
-session optional pam_ck_connector.so
|
||||||
|
session required pam_selinux.so open
|
||||||
|
session optional pam_keyinit.so force revoke
|
||||||
|
session required pam_namespace.so
|
||||||
|
session include system-auth
|
||||||
|
session include postlogin
|
||||||
@ -0,0 +1 @@
|
|||||||
|
pamd.kdm-trinity.el7
|
||||||
@ -0,0 +1,23 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
|
||||||
|
auth required pam_env.so
|
||||||
|
auth substack system-auth
|
||||||
|
-auth optional pam_gnome_keyring.so
|
||||||
|
-auth optional pam_kwallet.so
|
||||||
|
-auth optional pam_kwallet5.so
|
||||||
|
auth include postlogin
|
||||||
|
account required pam_nologin.so
|
||||||
|
account include system-auth
|
||||||
|
password include system-auth
|
||||||
|
session required pam_selinux.so close
|
||||||
|
session required pam_loginuid.so
|
||||||
|
session optional pam_console.so
|
||||||
|
-session optional pam_ck_connector.so
|
||||||
|
session required pam_selinux.so open
|
||||||
|
session optional pam_keyinit.so force revoke
|
||||||
|
session required pam_namespace.so
|
||||||
|
session include system-auth
|
||||||
|
-session optional pam_gnome_keyring.so auto_start
|
||||||
|
-session optional pam_kwallet.so
|
||||||
|
-session optional pam_kwallet5.so
|
||||||
|
session include postlogin
|
||||||
@ -0,0 +1 @@
|
|||||||
|
pamd.kscreensaver-trinity.el7
|
||||||
@ -0,0 +1,5 @@
|
|||||||
|
#%PAM-1.0
|
||||||
|
auth include system-auth
|
||||||
|
account include system-auth
|
||||||
|
password include system-auth
|
||||||
|
session include system-auth
|
||||||
@ -0,0 +1 @@
|
|||||||
|
tdm.el8.te
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
module tdm 1.0;
|
||||||
|
|
||||||
|
require {
|
||||||
|
type fprintd_t;
|
||||||
|
type init_t;
|
||||||
|
class dbus send_msg;
|
||||||
|
}
|
||||||
|
|
||||||
|
#============= fprintd_t ==============
|
||||||
|
allow fprintd_t init_t:dbus send_msg;
|
||||||
@ -0,0 +1 @@
|
|||||||
|
tdm.service.el7
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
[Unit]
|
||||||
|
Description=The Trinity login manager
|
||||||
|
Conflicts=getty@tty1.service
|
||||||
|
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/opt/trinity/bin/tdm
|
||||||
|
Restart=always
|
||||||
|
IgnoreSIGPIPE=no
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
Alias=display-manager.service
|
||||||
Loading…
Reference in new issue