Sun May 12 19:10:12 UTC 2024

a/less-654-x86_64-1.txz:  Upgraded.
d/ninja-1.12.1-x86_64-1.txz:  Upgraded.
n/whois-5.5.23-x86_64-1.txz:  Upgraded.
  Updated the .sc, .********* (.xn--yfro4i67o, Singapore)
  and .********************************* (.xn--clchc0ea0b2g2a9gcd, Singapore)
  TLD servers.
extra/bittornado/bittornado-0.3.18-noarch-3.txz:  Removed.
  Obsolete and based on python2.
This commit is contained in:
Patrick J Volkerding 2024-05-12 19:10:12 +00:00 committed by Eric Hameleers
parent afc0f1e9aa
commit abc3e67678
167 changed files with 6620 additions and 586 deletions

View file

@ -11,9 +11,27 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
<pubDate>Thu, 9 May 2024 19:26:51 GMT</pubDate>
<lastBuildDate>Thu, 9 May 2024 19:58:32 GMT</lastBuildDate>
<pubDate>Sun, 12 May 2024 19:10:12 GMT</pubDate>
<lastBuildDate>Sun, 12 May 2024 19:28:51 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
<title>Sun, 12 May 2024 19:10:12 GMT</title>
<pubDate>Sun, 12 May 2024 19:10:12 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20240512191012</link>
<guid isPermaLink="false">20240512191012</guid>
<description>
<![CDATA[<pre>
a/less-654-x86_64-1.txz: Upgraded.
d/ninja-1.12.1-x86_64-1.txz: Upgraded.
n/whois-5.5.23-x86_64-1.txz: Upgraded.
Updated the .sc, .********* (.xn--yfro4i67o, Singapore)
and .********************************* (.xn--clchc0ea0b2g2a9gcd, Singapore)
TLD servers.
extra/bittornado/bittornado-0.3.18-noarch-3.txz: Removed.
Obsolete and based on python2.
</pre>]]>
</description>
</item>
<item>
<title>Thu, 9 May 2024 19:26:51 GMT</title>
<pubDate>Thu, 9 May 2024 19:26:51 GMT</pubDate>

View file

@ -1,3 +1,13 @@
Sun May 12 19:10:12 UTC 2024
a/less-654-x86_64-1.txz: Upgraded.
d/ninja-1.12.1-x86_64-1.txz: Upgraded.
n/whois-5.5.23-x86_64-1.txz: Upgraded.
Updated the .sc, .********* (.xn--yfro4i67o, Singapore)
and .********************************* (.xn--clchc0ea0b2g2a9gcd, Singapore)
TLD servers.
extra/bittornado/bittornado-0.3.18-noarch-3.txz: Removed.
Obsolete and based on python2.
+--------------------------+
Thu May 9 19:26:51 UTC 2024
l/libjpeg-turbo-3.0.3-x86_64-1.txz: Upgraded.
l/nodejs-20.13.1-x86_64-1.txz: Upgraded.

File diff suppressed because it is too large Load diff

View file

@ -1,38 +0,0 @@
#!/bin/sh
CWD=`pwd`
PKG=/tmp/package-bittornado
VERSION=0.3.18
ARCH=noarch
BUILD=3
rm -rf $PKG
mkdir -p $PKG
cd /tmp
rm -rf BitTornado-CVS
tar xjvf $CWD/BitTornado-$VERSION.tar.bz2
cd BitTornado-CVS
chown -R root.root .
find . -perm 775 -exec chmod 755 {} \+
find . -perm 664 -exec chmod 644 {} \+
python setup.py build install --root=$PKG
# Add btdownloadxterm.sh (this just opens an xterm for btdownloadcurses.py so
# that it can work as a MIME handler from mailcap):
mkdir -p $PKG/usr/bin
zcat $CWD/btdownloadxterm.sh > $PKG/usr/bin/btdownloadxterm.sh
chmod 755 $PKG/usr/bin/btdownloadxterm.sh
chown -R root.bin $PKG/usr/bin
mkdir -p $PKG/usr/doc/BitTornado-$VERSION
cp -a \
LICENSE.txt README.txt \
docs/*.* \
$PKG/usr/doc/BitTornado-$VERSION
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
# Add support for using btdownloadcurses.py instead of btdownloadgui.py in /etc/mailcap:
zcat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
makepkg -l y -c n ../bittornado-$VERSION-$ARCH-$BUILD.txz

View file

@ -1,36 +0,0 @@
#!/bin/sh
# Copyright 2003 Slackware Linux, Inc., Concord, CA, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
#
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# /usr/bin/btdownloadxterm.sh
# A simple script used in /etc/mailcap to enable using
# btdownloadcurses.py with Mozilla, etc.
#
# This goes in /etc/mailcap:
#application/x-bittorrent; /usr/bin/btdownloadxterm.sh '%s' ;
# Create a directory for downloads:
if [ ! -d $HOME/BitTorrent ]; then
mkdir -p $HOME/BitTorrent
fi
# Change to the download directory and start BitTorrent there:
cd $HOME/BitTorrent && exec /usr/X11R6/bin/xterm -e /usr/bin/btdownloadcurses.py "$1"

View file

@ -1,17 +0,0 @@
# Add bittorrent support to /etc/mailcap unless it's found there
# already (commented out, or not):
if ! grep application/x-bittorrent etc/mailcap 1> /dev/null 2> /dev/null ; then
echo "application/x-bittorrent; /usr/bin/btdownloadxterm.sh '%s' ; " >> etc/mailcap
fi
# Add bittornado support to /etc/mailcap unless it's found there
# already (commented out, or not):
if ! grep application/x-bittorrent etc/mailcap 1> /dev/null 2> /dev/null ; then
echo "application/x-bittorrent; /usr/bin/btdownloadxterm.sh '%s' ; " >> etc/mailcap
else
# If it calls bittorrent-xterm, make btdownloadxterm.sh the default instead:
if grep bittorrent-xterm etc/mailcap 1> /dev/null 2> /dev/null ; then
sed -i -e 's/bittorrent-xterm/btdownloadxterm.sh/g' etc/mailcap
fi
fi

View file

@ -1,19 +0,0 @@
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
bittornado: BitTornado (a modified version of the BitTorrent utility)
bittornado:
bittornado: BitTornado is a file distribution utility which utilizes the upload
bittornado: capacity of machines which are downloading a file to help distribute
bittornado: it to other downloading machines.
bittornado:
bittornado: BitTornado is TheSHAD0W's experimental version of Bram Cohen's
bittornado: BitTorrent utility.
bittornado:
bittornado:
bittornado:

View file

@ -44,6 +44,9 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
# GCC 14 "fix":
export FSSTND="-Wno-error=incompatible-pointer-types -Wno-error=implicit-int -Wno-error=implicit-function-declaration"
TMP=${TMP:-/tmp}
PKG=$TMP/package-getty-ps

View file

@ -71,6 +71,10 @@ else
SLKCFLAGS="-O2"
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=declaration-missing-parameter-type"
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"

View file

@ -5,8 +5,6 @@
#
gzip ./extra/source/getty-ps/getty.bugfixes.diff
gzip ./extra/source/fltk/fltk.fltk-config.in.diff
gzip ./extra/source/bittornado/btdownloadxterm.sh
gzip ./extra/source/bittornado/doinst.sh
gzip ./extra/source/sendmail/Build
gzip ./extra/source/tigervnc/patches/tigervnc.pam.d.diff
gzip ./extra/source/tigervnc/patches/force_protocol_3.3_for_UVNCSC.patch
@ -211,6 +209,7 @@ gzip ./source/a/util-linux/util-linux.fdisk-no-solaris.diff
gzip ./source/a/util-linux/seedrng.8
gzip ./source/a/util-linux/adjtimex_1.29-2.2.diff
gzip ./source/a/util-linux/doinst.sh
gzip ./source/a/util-linux/bsdstrings.gcc14.diff
gzip ./source/a/util-linux/ziptool-fix_build.patch
gzip ./source/a/sharutils/sharutils.glibc228.diff
gzip ./source/a/infozip/unzip-patches/unzip-6.0-manpage-fix.patch
@ -229,6 +228,7 @@ gzip ./source/a/infozip/unzip-patches/unzip-6.0-exec-shield.patch
gzip ./source/a/infozip/unzip-patches/unzip-6.0-cve-2014-8141.patch
gzip ./source/a/infozip/unzip-patches/unzip-6.0-cve-2014-8140.patch
gzip ./source/a/infozip/unzip-patches/unzip-6.0-overflow.patch
gzip ./source/a/infozip/unzip-patches/unzip.gnu89.diff
gzip ./source/a/infozip/unzip-patches/unzip-6.0-configure.patch
gzip ./source/a/infozip/unzip-patches/unzip-6.0-symlink.patch
gzip ./source/a/infozip/unzip-patches/unzip-6.0-close.patch
@ -244,6 +244,7 @@ gzip ./source/a/infozip/zip-patches/zip-3.0-currdir.patch
gzip ./source/a/infozip/zip-patches/zip-3.0-time.patch
gzip ./source/a/infozip/zip-patches/man.patch
gzip ./source/a/infozip/zip-patches/zip-3.0-exec-shield.patch
gzip ./source/a/infozip/zip-patches/zip.gnu89.diff
gzip ./source/a/nvi/patches/nvi-06-default_value_escapetime.patch
gzip ./source/a/nvi/patches/nvi-03-db4.patch
gzip ./source/a/nvi/patches/nvi-25-manpage_note_dropped_F.patch
@ -262,6 +263,7 @@ gzip ./source/a/nvi/patches/nvi-08-lfs.patch
gzip ./source/a/nvi/patches/nvi-08-safe_printf.patch
gzip ./source/a/nvi/patches/nvi-04-confdefs.patch
gzip ./source/a/nvi/patches/nvi-11-backward_sentence_moving.patch
gzip ./source/a/nvi/patches/0039-Add-function-prototypes-to-fix-implicit-function-dec.patch
gzip ./source/a/nvi/patches/nvi-19-include_term_h.patch
gzip ./source/a/nvi/patches/nvi-20-glibc_has_grantpt.patch
gzip ./source/a/nvi/patches/nvi-01-additional_upstream_data.patch
@ -284,6 +286,7 @@ gzip ./source/a/lilo/lilo.allow.colons.in.by-id.diff
gzip ./source/a/lilo/lilo.nvme.support.diff
gzip ./source/a/lilo/lilo.ignore.usable.memory.above.4G.diff
gzip ./source/a/upower/doinst.sh
gzip ./source/a/zoo/zoo.gcc14.diff
gzip ./source/a/jfsutils/jfsutils.glibc228.diff
gzip ./source/a/jfsutils/jfsutils.inttypes.h.diff
gzip ./source/a/elvis/elvis.ref.c.getline.diff
@ -331,6 +334,7 @@ gzip ./source/y/bsd-games/patches/0013-Update-acronyms.patch
gzip ./source/y/bsd-games/patches/bsd-games.fortunepath.diff
gzip ./source/y/bsd-games/patches/0004-Define-__dead-for-GNU-GCC.patch
gzip ./source/y/bsd-games/patches/0010-Fix-typos-spotted-by-Lintian.patch
gzip ./source/y/bsd-games/patches/bsd-games.gcc14.diff
gzip ./source/y/bsd-games/patches/0002-robots-Refresh-screen.patch
gzip ./source/y/bsd-games/patches/0009-hangman-Error-out-on-1000-unsuitable-words.-Closes-6.patch
gzip ./source/y/bsd-games/patches/0001-Replace-getline-with-get_line.patch
@ -360,10 +364,13 @@ gzip ./source/n/rdist/rdist-6.1.5-03.hardlink.diff
gzip ./source/n/rdist/rdist-6.1.5-12.stat64.diff
gzip ./source/n/bluez/doinst.sh
gzip ./source/n/iproute2/doinst.sh
gzip ./source/n/tftp-hpa/tftp-hpa.gcc14.diff
gzip ./source/n/tftp-hpa/tftp-hpa.fcommon.diff
gzip ./source/n/netdate/netdate.diff2
gzip ./source/n/netdate/netdate.diff
gzip ./source/n/netdate/netdate.gcc14.diff
gzip ./source/n/procmail/procmail.lfs.diff
gzip ./source/n/procmail/procmail.gcc14.diff
gzip ./source/n/nfs-utils/doinst.sh
gzip ./source/n/nfs-utils/nfs-utils.lwrap.needs.lnsl.diff
gzip ./source/n/metamail/metamail.uue.getline.diff
@ -395,6 +402,7 @@ gzip ./source/n/ppp/options.new
gzip ./source/n/ppp/pppsetup-1.98.backupfiles.diff
gzip ./source/n/inetd/inetd-OpenBSD-1.79.diff
gzip ./source/n/inetd/fix-x86_64-daytime-segfault.diff
gzip ./source/n/inetd/inetd.gcc14.diff
gzip ./source/n/inetd/inetd.libtirpc.diff
gzip ./source/n/inetd/doinst.sh
gzip ./source/n/inetd/inetd.loopingdos.diff
@ -431,6 +439,7 @@ gzip ./source/n/netkit-ntalk/netkit-ntalk-0.11.diff
gzip ./source/n/popa3d/popa3d.shadow.diff
gzip ./source/n/popa3d/popa3d.pam.diff
gzip ./source/n/popa3d/doinst.sh
gzip ./source/n/popa3d/popa3d.gcc14.diff
gzip ./source/n/ca-certificates/fixup_update-ca-certificates.diff
gzip ./source/n/ca-certificates/doinst.sh
gzip ./source/n/ca-certificates/update-ca-certificates.c_rehash.diff
@ -439,6 +448,7 @@ gzip ./source/n/iptraf-ng/iptraf-ng.paths.diff
gzip ./source/n/nss-pam-ldapd/doinst.sh
gzip ./source/n/bootp/bootp_2.4.3-15.diff
gzip ./source/n/bootp/bootptab
gzip ./source/n/lftp/lftp.c99.patch
gzip ./source/n/lftp/doinst.sh
gzip ./source/n/postfix/postfix.script.starting.message.diff
gzip ./source/n/postfix/0001-openssl-micro-mismatch-nowarn.patch
@ -616,6 +626,7 @@ gzip ./source/ap/terminus-font/doinst.sh
gzip ./source/ap/dmapi/bug799162.patch
gzip ./source/ap/ksh93/doinst.sh
gzip ./source/ap/sc/sc-7.16-3.diff
gzip ./source/ap/sc/sc.gcc14.diff
gzip ./source/ap/sqlite/COPYRIGHT
gzip ./source/ap/nano/doinst.sh
gzip ./source/ap/gutenprint/doinst.sh
@ -831,8 +842,6 @@ gzip ./source/l/libtheora/libtheora-1.1.1.latex.patch
gzip ./source/l/libtheora/libtheora-1.1.1-libpng16.patch
gzip ./source/l/libnl3/doinst.sh
gzip ./source/l/libindicator/libindicator.LIBM.diff
gzip ./source/l/pilot-link/pilot-link-0.12.5-redefinePerlsymbols.patch
gzip ./source/l/pilot-link/pilot-link.png14.diff
gzip ./source/l/pipewire/doinst.sh
gzip ./source/l/avahi/doinst.sh
gzip ./source/l/libcanberra/libcanberra-0.30-wayland-1.patch

View file

@ -76,6 +76,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
# Don't use icecream:
PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")

View file

@ -63,6 +63,8 @@ zcat $CWD/zip-patches/zip-3.0-time.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/zip-patches/man.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/zip-patches/zip-3.0-format-security.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/zip-patches/zipnote.patch.gz | patch -p1 --verbose || exit 1
# GCC 14 fix:
zcat $CWD/zip-patches/zip.gnu89.diff.gz | patch -p1 --verbose || exit 1
chown -R root:root .
mkdir -p $PKG/usr/doc/zip-$ZIP
@ -112,6 +114,8 @@ zcat $CWD/unzip-patches/unzip-6.0-timestamp.patch.gz | patch -p1 --verbose || ex
zcat $CWD/unzip-patches/unzip-6.0-cve-2018-1000035-heap-based-overflow.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/unzip-patches/unzip-6.0-cve-2018-18384.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/unzip-patches/unzip-6.0-COVSCAN-fix-unterminated-string.patch.gz | patch -p1 --verbose || exit 1
# GCC 14 fix:
zcat $CWD/unzip-patches/unzip.gnu89.diff.gz | patch -p1 --verbose || exit 1
chown -R root:root .
mkdir -p $PKG/usr/doc/unzip-$VERSION
@ -120,7 +124,7 @@ cp -a BUGS COPYING* Contents History.* INSTALL LICENSE README ToDo WHERE \
chmod 644 $PKG/usr/doc/unzip-$VERSION/*
# -DNO_LCHMOD because Linux systems do not have lchmod()
# -DNOMEMCPY is slower, but prevents file corruption
make -f unix/Makefile generic LOCAL_UNZIP="-DIZ_HAVE_UXUIDGID -DNOMEMCPY -DNO_LCHMOD" || exit 1
make -f unix/Makefile generic_gcc LOCAL_UNZIP="-DIZ_HAVE_UXUIDGID -DNOMEMCPY -DNO_LCHMOD" || exit 1
cat unzip > $PKG/usr/bin/unzip
cat unzipsfx > $PKG/usr/bin/unzipsfx
cat funzip > $PKG/usr/bin/funzip

View file

@ -0,0 +1,11 @@
--- ./unix/Makefile.orig 2009-01-18 16:41:18.000000000 -0600
+++ ./unix/Makefile 2024-05-11 12:50:37.503835132 -0500
@@ -545,7 +545,7 @@
# make $(MAKEF) unzips CF="${CF} `cat flags`"
generic_gcc:
- $(MAKE) $(MAKEF) generic CC=gcc IZ_BZIP2="$(IZ_BZIP2)"
+ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" IZ_BZIP2="$(IZ_BZIP2)"
# extensions to perform SVR4 package-creation after compilation
generic_pkg: generic svr4package

View file

@ -0,0 +1,11 @@
--- ./unix/Makefile.orig 2024-05-11 12:47:26.628830862 -0500
+++ ./unix/Makefile 2024-05-11 12:48:43.705832586 -0500
@@ -202,7 +202,7 @@
eval $(MAKE) $(MAKEF) zips `cat flags`
generic_gcc:
- $(MAKE) $(MAKEF) generic CC=gcc CPP="gcc -E"
+ $(MAKE) $(MAKEF) generic CC="gcc -std=gnu89" CPP="gcc -E"
# AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
att6300nodir:

View file

@ -1,73 +0,0 @@
From 007521ac3c95bc76e3d59c6dbfe75d06c8075c33 Mon Sep 17 00:00:00 2001
From: Mark Nudelman <markn@greenwoodsoftware.com>
Date: Thu, 11 Apr 2024 17:49:48 -0700
Subject: [PATCH] Fix bug when viewing a file whose name contains a newline.
---
filename.c | 31 +++++++++++++++++++++++++------
1 file changed, 25 insertions(+), 6 deletions(-)
diff --git a/filename.c b/filename.c
index f90e0e82..a52c6354 100644
--- a/filename.c
+++ b/filename.c
@@ -127,11 +127,20 @@ static constant char * metachars(void)
/*
* Is this a shell metacharacter?
*/
-static int metachar(char c)
+static lbool metachar(char c)
{
return (strchr(metachars(), c) != NULL);
}
+/*
+ * Must use quotes rather than escape char for this metachar?
+ */
+static lbool must_quote(char c)
+{
+ /* {{ Maybe the set of must_quote chars should be configurable? }} */
+ return (c == '\n');
+}
+
/*
* Insert a backslash before each metacharacter in a string.
*/
@@ -164,6 +173,9 @@ public char * shell_quoten(constant char *s, size_t slen)
* doesn't support escape chars. Use quotes.
*/
use_quotes = TRUE;
+ } else if (must_quote(*p))
+ {
+ len += 3; /* open quote + char + close quote */
} else
{
/*
@@ -194,15 +206,22 @@ public char * shell_quoten(constant char *s, size_t slen)
constant char *es = s + slen;
while (s < es)
{
- if (metachar(*s))
+ if (!metachar(*s))
{
- /*
- * Add the escape char.
- */
+ *np++ = *s++;
+ } else if (must_quote(*s))
+ {
+ /* Surround the char with quotes. */
+ *np++ = openquote;
+ *np++ = *s++;
+ *np++ = closequote;
+ } else
+ {
+ /* Insert an escape char before the char. */
strcpy(np, esc);
np += esclen;
+ *np++ = *s++;
}
- *np++ = *s++;
}
*np = '\0';
}

View file

@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=less
VERSION=${VERSION:-$(echo less-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-2}
BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@ -85,9 +85,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
# newline in filenames patch for CVE-2024-32487:
cat $CWD/007521ac3c95bc76.patch | patch -p1 --verbose || exit 1
if [ ! -r configure ]; then
if [ -x ./autogen.sh ]; then
NOCONFIGURE=1 ./autogen.sh

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -59,6 +59,9 @@ else
SLKCFLAGS="-O2"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration"
rm -rf $PKG
mkdir -p $TMP $PKG
@ -123,6 +126,7 @@ zcat $CWD/lrzsz_0.12.21-5.diff.gz | patch -p1 --verbose || exit 1
rm -f debian/patches/{206499_ymodemg.diff.unchecked,206648_dszlog.diff.unchecked}
for i in debian/patches/* ; do patch -p1 < $i || exit 1 ; done
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--mandir=/usr/man \

View file

@ -68,6 +68,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@ -92,7 +95,7 @@ done
# Configure, build, and install:
cd build.unix
CFLAGS="$SLKCFLAGS" \
OPTFLAG="$SLKCFLAGS" \
../dist/configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \

View file

@ -0,0 +1,87 @@
From: Michael Hudson-Doyle <michael.hudson@ubuntu.com>
Date: Thu, 11 Apr 2024 11:18:39 +0200
Subject: Add function prototypes to fix implicit function declaration errors
Reviewed-By: Tobias Heider <me@tobhe.de>
Bug-Debian: https://bugs.debian.org/1066285
---
cl/cl.h | 5 +++++
cl/cl_funcs.c | 6 ++++++
common/conv.h | 3 +++
common/multibyte.h | 6 ++++++
dist/configure | 1 +
5 files changed, 21 insertions(+)
diff --git a/cl/cl.h b/cl/cl.h
index 3d71410..4ff232d 100644
--- a/cl/cl.h
+++ b/cl/cl.h
@@ -26,6 +26,11 @@
#endif
#endif
+/*
+ * for setupterm()
+ */
+#include <term.h>
+
typedef struct _cl_private {
char ibuf[256]; /* Input keys. */
diff --git a/cl/cl_funcs.c b/cl/cl_funcs.c
index c5fc597..b6174ef 100644
--- a/cl/cl_funcs.c
+++ b/cl/cl_funcs.c
@@ -31,6 +31,12 @@ static const char sccsid[] = "$Id: cl_funcs.c,v 10.72 2002/03/02 23:18:33 skimo
#include "../vi/vi.h"
#include "cl.h"
+/*
+ * This is declared by ncurses.h, but only if _XOPEN_SOURCE is set and lots of
+ * other things break if we define that.
+ */
+extern int waddnwstr (WINDOW *,const wchar_t *,int);
+
static void cl_rdiv __P((SCR *));
static int
diff --git a/common/conv.h b/common/conv.h
index 76b06c1..a7675c4 100644
--- a/common/conv.h
+++ b/common/conv.h
@@ -21,3 +21,6 @@ struct _conv {
char2wchar_t input2int;
wchar2char_t int2disp;
};
+
+extern int conv_enc (SCR *sp, int option, char *enc);
+extern void conv_init (SCR *orig, SCR *sp);
diff --git a/common/multibyte.h b/common/multibyte.h
index 820f4ec..2484521 100644
--- a/common/multibyte.h
+++ b/common/multibyte.h
@@ -5,6 +5,12 @@
#include <wchar.h>
#include <wctype.h>
+/*
+ * This is declared by wchar.h, but only if _XOPEN_SOURCE is set and lots of
+ * other things break if we define that.
+ */
+extern int wcwidth (wchar_t c);
+
typedef wchar_t RCHAR_T;
#define RCHAR_T_MAX ((1 << 24)-1)
typedef wchar_t CHAR_T;
diff --git a/dist/configure b/dist/configure
index b23e167..d7fb54f 100755
--- a/dist/configure
+++ b/dist/configure
@@ -27385,6 +27385,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$CURSHEADER>
+#include <term.h>
int
main ()
{

View file

@ -55,7 +55,13 @@ rm -rf splitvt-1.6.6
tar xzvf $CWD/splitvt-1.6.6.tar.gz
cd splitvt-1.6.6
chown -R root:root .
cat $CWD/splitvt.configure.gcc14.diff | patch -p1 --verbose || exit 1
./configure
sed -i "s|DNEED_SELECT_H|DNEED_SELECT_H -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch|g" Makefile
make || exit 1
mkdir -p $PKG/usr/bin
cat splitvt > $PKG/usr/bin/splitvt

View file

@ -0,0 +1,11 @@
--- ./configure.orig 2007-04-01 10:22:48.000000000 -0500
+++ ./configure 2024-05-11 18:35:55.108298585 -0500
@@ -4,7 +4,7 @@
QUIET="-v"
# use $CC if set, else set it to cc
: ${CC:=cc}
-CFLAGS=
+CFLAGS="-Wno-error=implicit-function-declaration -Wno-error=implicit-int"
MAKE="echo \"Done. Type 'make' to build\""
echo "Making configuration..."

View file

@ -0,0 +1,11 @@
--- ./configure.orig 2007-04-01 10:22:48.000000000 -0500
+++ ./configure 2024-05-11 18:30:49.454291747 -0500
@@ -4,7 +4,7 @@
QUIET="-v"
# use $CC if set, else set it to cc
: ${CC:=cc}
-CFLAGS=
+CFLAGS="-Wno-error=implicit-function-declaration -Wno-error=implicit-int"
MAKE="echo \"Done. Type 'make' to build\""
echo "Making configuration..."

View file

@ -0,0 +1,9 @@
--- ./Makefile.orig 2007-04-29 13:15:50.000000000 -0500
+++ ./Makefile 2024-05-10 18:22:44.593348134 -0500
@@ -1,5 +1,5 @@
-CFLAGS=-O2 -Wall -D_GNU_SOURCE
+CFLAGS=-O2 -Wall -D_GNU_SOURCE -Wno-error=incompatible-pointer-types
PROGS=usleep initlog fstab-decode consoletype
PPPWATCH_OBJS=ppp-watch.o shvar.o

View file

@ -66,6 +66,7 @@ rm -rf function-src-$VERSION
# A small patch was applied to initlog to shut it the %^@& up.
tar xjf $CWD/function-src-$VERSION.tar.bz2 || exit 1
cd function-src-$VERSION
cat $CWD/function-src.gcc14.diff | patch -p1 --verbose || exit 1
make || exit 1
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
mkdir -p $PKG/bin $PKG/sbin $PKG/usr/man/man{1,8}

View file

@ -4,7 +4,7 @@
#
CC = gcc
CFLAGS = -O2 -DUNIX
CFLAGS = -O2 -DUNIX -Wno-error=implicit-function-declaration
INSTALLDIR=/usr/bin
unarj: unarj.o decode.o environ.o

View file

@ -0,0 +1,12 @@
--- ./Makefile.orig 2000-05-09 16:18:53.000000000 -0500
+++ ./Makefile 2024-05-12 12:42:00.509961363 -0500
@@ -1,7 +1,8 @@
CC = gcc
+CFLAGS = -O -Wno-error=implicit-function-declaration -Wno-error=implicit-int
strings: strings.o getopt.o
- gcc -O -o strings strings.c getopt.c
+ gcc $(CFLAGS) -o strings strings.c getopt.c
clean:
rm -f a.out core *~ *.o strings

View file

@ -254,6 +254,7 @@ rm -rf bsdstrings
tar xvf $CWD/bsdstrings.tar.gz || exit 1
cd bsdstrings || exit 1
zcat $CWD/bsdstrings-util-linux_overflow.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/bsdstrings.gcc14.diff.gz | patch -p1 --verbose || exit 1
make || exit 1
strip strings
cat strings > $PKG/usr/bin/strings-BSD
@ -286,7 +287,8 @@ chown -R root:root .
zcat $CWD/setserial-rc.serial.diff.gz | patch -E -p1 --verbose || exit 1
zcat $CWD/setserial-undef_TIOCGHAYESESP.diff.gz | patch -E -p1 --verbose || exit 1
# The original config.{guess,sub} do not work on x86_64
cp -p /usr/share/libtool/config/config.{guess,sub} .
cp -p /usr/share/libtool/build-aux/config.{guess,sub} .
CFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration" \
./configure --prefix=/usr || exit 1
make || exit 1
strip setserial
@ -370,4 +372,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/util-linux-$VERSION-$ARCH-$BUILD.txz

View file

@ -67,6 +67,7 @@ tar xf $CWD/zoo_${VERSION}-${DEBPATCH}.debian.tar.?z
for diff in debian/patches/*patch ; do
cat $diff | patch -p1 --verbose --backup --suffix=.orig || exit 1
done
zcat $CWD/zoo.gcc14.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
make linux || exit 1
mkdir -p $PKG/usr/bin

View file

@ -0,0 +1,11 @@
--- ./makefile.orig 2024-05-11 01:34:14.429927290 -0500
+++ ./makefile 2024-05-11 01:35:16.723928683 -0500
@@ -102,7 +102,7 @@
# Linux
linux:
- $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS" LDFLAGS="$(LDFLAGS)" $(TARGETS)
+ $(MAKE) CC="gcc" CFLAGS="-c $(OPTIM) $(LINTFLAGS) -DLINUX -DANSI_HDRS -Wno-error=implicit-int" LDFLAGS="$(LDFLAGS)" $(TARGETS)
# Linux64
linux64:

View file

@ -58,7 +58,7 @@ zcat $CWD/amp-gcc34.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exi
# Avoid crashes caused by using agressive optimization with newer compilers:
zcat $CWD/amp.do.not.overoptimize.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
chown -R root:root .
./configure --prefix=/usr $ARCH-slackware-linux || exit 1
CFLAGS="-Wno-error=implicit-int" ./configure --prefix=/usr $ARCH-slackware-linux || exit 1
make || exit 1
mkdir -p $PKG/usr/doc $PKG/usr/bin $PKG/usr/man/man1
strip amp

View file

@ -54,6 +54,9 @@ else
SLKCFLAGS="-O2"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
TMP=${TMP:-/tmp}
PKG=$TMP/package-bpe
@ -71,7 +74,8 @@ zcat $CWD/bpe.port.to.strerror.diff.gz | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr || exit 1
--prefix=/usr \
$ARCH-slackware-linux-gnu || exit 1
make || exit 1
make install DESTDIR=$PKG || exit 1
( cd $PKG
@ -88,4 +92,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
makepkg -l y -c n $TMP/bpe-$VERSION-$ARCH-$BUILD.txz

View file

@ -66,6 +66,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
# GCC 14 "fix":
export CFLAGS="-Wno-error=implicit-int -Wno-error=implicit-function-declaration"
# When running make below, you'll see "errors" like these:
# config.h:34:10: fatal error: lconfig.h: No such file or directory
# 34 | #include "lconfig.h"

View file

@ -68,6 +68,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"
cd $TMP
rm -rf ${SRCPREFIX}${PKGNAM}-${VERSION}
tar xvf $CWD/${SRCPREFIX}${PKGNAM}-$VERSION.tar.?z || exit 1

View file

@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion"
TMP=${TMP:-/tmp}
PKG=$TMP/package-gutenprint
rm -rf $PKG
@ -76,6 +79,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \

View file

@ -0,0 +1,615 @@
diff -up hplip-3.23.3/common/utils.c.covscan hplip-3.23.3/common/utils.c
--- hplip-3.23.3/common/utils.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/common/utils.c 2023-05-29 13:58:10.969395214 +0200
@@ -1,5 +1,9 @@
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
#include "utils.h"
-#include "string.h"
+#include <string.h>
#include <dlfcn.h>
#include <sys/stat.h>
#include <errno.h>
diff -up hplip-3.23.3/io/hpmud/hpmud.c.covscan hplip-3.23.3/io/hpmud/hpmud.c
--- hplip-3.23.3/io/hpmud/hpmud.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/io/hpmud/hpmud.c 2023-05-29 13:58:10.970395208 +0200
@@ -759,6 +759,7 @@ enum HPMUD_RESULT hpmud_get_dstat(HPMUD_
}
strncpy(ds->uri, msp->device[dd].uri, sizeof(ds->uri));
+ ds->uri[sizeof(ds->uri)-1] = '\0';
ds->io_mode = msp->device[dd].io_mode;
ds->channel_cnt = msp->device[dd].channel_cnt;
ds->mlc_up = msp->device[dd].mlc_up;
diff -up hplip-3.23.3/io/hpmud/jd.c.covscan hplip-3.23.3/io/hpmud/jd.c
--- hplip-3.23.3/io/hpmud/jd.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/io/hpmud/jd.c 2023-05-29 13:58:10.970395208 +0200
@@ -31,6 +31,7 @@
#endif
#include <signal.h>
+#include <stdlib.h>
#include "hpmud.h"
#include "hpmudi.h"
diff -up hplip-3.23.3/io/hpmud/model.c.covscan hplip-3.23.3/io/hpmud/model.c
--- hplip-3.23.3/io/hpmud/model.c.covscan 2023-05-29 13:58:10.958395279 +0200
+++ hplip-3.23.3/io/hpmud/model.c 2023-05-29 13:58:10.970395208 +0200
@@ -117,6 +117,7 @@ static int ReadConfig()
if (rcbuf[0] == '[')
{
strncpy(section, rcbuf, sizeof(section)); /* found new section */
+ section[sizeof(section)-1] = '\0';
continue;
}
@@ -125,6 +126,7 @@ static int ReadConfig()
if ((strncasecmp(section, "[dirs]", 6) == 0) && (strcasecmp(key, "home") == 0))
{
strncpy(homedir, value, sizeof(homedir));
+ homedir[sizeof(homedir)-1] = '\0';
break; /* done */
}
}
diff -up hplip-3.23.3/io/hpmud/musb.c.covscan hplip-3.23.3/io/hpmud/musb.c
--- hplip-3.23.3/io/hpmud/musb.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/io/hpmud/musb.c 2023-05-29 13:58:10.970395208 +0200
@@ -776,7 +776,7 @@ static int device_id(int fd, unsigned ch
len = size-1; /* leave byte for zero termination */
if (len > 2)
len -= 2;
- memcpy(buffer, buffer+2, len); /* remove length */
+ memmove(buffer, buffer+2, len); /* remove length */
buffer[len]=0;
DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);
diff -up hplip-3.23.3/io/hpmud/pp.c.covscan hplip-3.23.3/io/hpmud/pp.c
--- hplip-3.23.3/io/hpmud/pp.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/io/hpmud/pp.c 2023-05-29 13:58:10.970395208 +0200
@@ -632,7 +632,7 @@ static int device_id(int fd, char *buffe
len = size-1; /* leave byte for zero termination */
if (len > 2)
len -= 2;
- memcpy(buffer, buffer+2, len); /* remove length */
+ memmove(buffer, buffer+2, len); /* remove length */
buffer[len]=0;
DBG("read actual device_id successfully fd=%d len=%d\n", fd, len);
diff -up hplip-3.23.3/Makefile.am.covscan hplip-3.23.3/Makefile.am
--- hplip-3.23.3/Makefile.am.covscan 2023-05-29 13:58:10.944395361 +0200
+++ hplip-3.23.3/Makefile.am 2023-05-29 13:58:10.969395214 +0200
@@ -3,7 +3,7 @@
#
# (c) 2004-2015 Copyright HP Development Company, LP
# Author: David Suffield, Naga Samrat Chowdary Narla, Sarbeswar Meher
-INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/
+INCLUDES = -Iip -Iio/hpmud -Iscan/sane -Iprnt/hpijs -Icommon/ -Iprotocol
CFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
CXXFLAGS+= -DCONFDIR=\"$(hplip_confdir)\"
@@ -310,7 +310,7 @@ dist_pcard_DATA = pcard/__init__.py pcar
pcardextdir = $(pyexecdir)
pcardext_LTLIBRARIES = pcardext.la
pcardext_la_LDFLAGS = -module -avoid-version
-pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c
+pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h
pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
# prnt
@@ -322,7 +322,7 @@ lib_LTLIBRARIES += libhpipp.la
#hpipp_LTLIBRARIES = hpipp.la
#hpipp_la_LDFLAGS = -module -avoid-version
libhpipp_la_SOURCES = protocol/hp_ipp.c protocol/hp_ipp.h protocol/hp_ipp_i.h
-libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
+libhpipp_la_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" -D_GNU_SOURCE
libhpipp_la_LDFLAGS = -version-info 0:1:0
libhpipp_la_LIBADD = libhpmud.la
diff -up hplip-3.23.3/pcard/fat.c.covscan hplip-3.23.3/pcard/fat.c
--- hplip-3.23.3/pcard/fat.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/pcard/fat.c 2023-05-29 13:58:10.971395203 +0200
@@ -519,14 +519,17 @@ int FatFreeSpace(void)
int FatDiskAttributes( PHOTO_CARD_ATTRIBUTES * pa )
{
- strncpy( pa->OEMID, bpb.OEMID, 8 );
+ strncpy(pa->OEMID, bpb.OEMID, sizeof(pa->OEMID));
+ pa->OEMID[sizeof(pa->OEMID)-1] = '\0';
pa->BytesPerSector = bpb.BytesPerSector;
pa->SectorsPerCluster = bpb.SectorsPerCluster;
pa->ReservedSectors = bpb.ReservedSectors;
pa->SectorsPerFat = bpb.SectorsPerFat;
pa->RootEntries = bpb.RootEntries;
- strncpy( pa->SystemID, (char *)bpb.SystemID, 8 );
- strncpy( pa->VolumeLabel, (char *)bpb.VolumeLabel, 11 );
+ strncpy(pa->SystemID, (char *)bpb.SystemID, sizeof(pa->SystemID));
+ pa->SystemID[sizeof(pa->SystemID)-1] = '\0';
+ strncpy(pa->VolumeLabel, (char *)bpb.VolumeLabel, sizeof(pa->VolumeLabel));
+ pa->VolumeLabel[sizeof(pa->VolumeLabel)-1] = '\0';
pa->WriteProtect = da.WriteProtect;
return 0;
@@ -741,6 +744,7 @@ int FatSetCWD(char *dir)
return 1;
strncpy(cwd.Name, fa.Name, sizeof(cwd.Name));
+ cwd.Name[sizeof(cwd.Name)-1] = '\0';
cwd.StartSector = ConvertClusterToSector(fa.StartCluster);
cwd.CurrSector = cwd.StartSector;
cwd.StartCluster = fa.StartCluster;
diff -up hplip-3.23.3/prnt/hpijs/context2.cpp.covscan hplip-3.23.3/prnt/hpijs/context2.cpp
--- hplip-3.23.3/prnt/hpijs/context2.cpp.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/prnt/hpijs/context2.cpp 2023-05-29 13:58:10.971395203 +0200
@@ -1302,6 +1302,7 @@ DRIVER_ERROR PrintContext::SelectDevice
if(0 == strnlen((const char *)pSS->strDevID, DevIDBuffSize))
{
strncpy((char *)pSS->strDevID,szDeviceId,DevIDBuffSize);
+ pSS->strDevID[sizeof(pSS->strDevID)-1] = '\0';
}
thePrinter = pPFI->CreatePrinter (pSS, familyHandle);
if (thePrinter->constructor_error != NO_ERROR)
diff -up hplip-3.23.3/prnt/hpijs/systemservices.cpp.covscan hplip-3.23.3/prnt/hpijs/systemservices.cpp
--- hplip-3.23.3/prnt/hpijs/systemservices.cpp.covscan 2023-03-28 09:26:27.000000000 +0200
+++ hplip-3.23.3/prnt/hpijs/systemservices.cpp 2023-05-29 13:58:10.971395203 +0200
@@ -396,7 +396,10 @@ void SystemServices::AdjustIO(IO_MODE IM
IOMode.bDevID =IM.bDevID && IOMode.bDevID;
if (model)
+ {
strncpy(strModel,model, sizeof(strModel));
+ strModel[sizeof(strModel)-1] = '\0';
+ }
}
APDK_END_NAMESPACE
diff -up hplip-3.23.3/prnt/hpps/hppsfilter.c.covscan hplip-3.23.3/prnt/hpps/hppsfilter.c
--- hplip-3.23.3/prnt/hpps/hppsfilter.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/prnt/hpps/hppsfilter.c 2023-05-29 13:58:10.972395197 +0200
@@ -274,13 +274,13 @@ static void WriteHeader(char **argument)
/* Writing Header Information
argument[1] = JOB ID , argument[2]= USERNAME, argument[3] = TITLE */
hpwrite("\x1b%-12345X@PJL JOBNAME=", strlen("\x1b%-12345X@PJL JOBNAME="));
- sprintf(buffer, "hplip_%s_%s\x0a", argument[2], argument[1]);
+ snprintf(buffer, MAX_BUFFER-1, "hplip_%s_%s\x0a", argument[2], argument[1]);
hpwrite(buffer, strlen(buffer));
memset(buffer, 0, sizeof(buffer));
- sprintf(buffer, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]);
+ snprintf(buffer, MAX_BUFFER-1, "@PJL SET USERNAME=\"%s\"\x0a", argument[2]);
hpwrite(buffer, strlen(buffer));
memset(buffer, 0, sizeof(buffer));
- sprintf(buffer, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]);
+ snprintf(buffer, MAX_BUFFER-1, "@PJL SET JOBNAME=\"%s\"\x0a", argument[3]);
hpwrite(buffer, strlen(buffer));
fprintf(stderr, "HP PS filter func = WriteHeader : WRITING PJL HEADER INFO\n");
return;
diff -up hplip-3.23.3/protocol/hp_ipp.h.covscan hplip-3.23.3/protocol/hp_ipp.h
--- hplip-3.23.3/protocol/hp_ipp.h.covscan 2023-05-29 13:58:10.972395197 +0200
+++ hplip-3.23.3/protocol/hp_ipp.h 2023-05-29 13:59:03.645085468 +0200
@@ -168,6 +168,11 @@ HPIPP_RESULT parseResponseHeader(char* h
HPIPP_RESULT prepend_http_header(raw_ipp *raw_request,const char *resource);
enum HPMUD_RESULT sendUSBRequest(char *buf, int size, raw_ipp *responseptr, char * device_uri);
enum HPMUD_RESULT sendUSBFileRequest(char *buf, int size, int fileHandle,raw_ipp *responseptr, char *device_uri);
+void _releaseCupsInstance();
+int addCupsPrinter(char *name, char *device_uri, char *location, char *ppd_file, char *model, char *info);
+int delCupsPrinter(char *pr_name);
+int setDefaultCupsPrinter(char *pr_name);
+int controlCupsPrinter(char *pr_name, int op);
ipp_t * createFaxDetailRequest(const char *printer_name);
ipp_t * getDeviceFaxModemAttributes(char* device_uri,char* printer_name, int *count);
diff -up hplip-3.23.3/scan/sane/bb_ledm.c.covscan hplip-3.23.3/scan/sane/bb_ledm.c
--- hplip-3.23.3/scan/sane/bb_ledm.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/bb_ledm.c 2023-05-29 13:58:10.972395197 +0200
@@ -26,6 +26,7 @@
# include "http.h"
# include "xml.h"
# include <stdlib.h>
+# include <unistd.h>
# include <stdint.h>
diff -up hplip-3.23.3/scan/sane/common.h.covscan hplip-3.23.3/scan/sane/common.h
--- hplip-3.23.3/scan/sane/common.h.covscan 2023-05-29 13:58:10.727396637 +0200
+++ hplip-3.23.3/scan/sane/common.h 2023-05-29 13:58:10.972395197 +0200
@@ -36,7 +36,7 @@
#define _STRINGIZE(x) #x
#define STRINGIZE(x) _STRINGIZE(x)
-#define BUG(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
+#define BUG_SCAN(args...) {syslog(LOG_ERR, __FILE__ " " STRINGIZE(__LINE__) ": " args); DBG(2, __FILE__ " " STRINGIZE(__LINE__) ": " args);}
#define BUG_DUMP(data, size) bugdump((data), (size))
#define BUG_SZ(args...) {syslog(LOG_ERR, args); DBG(2, args);}
diff -up hplip-3.23.3/scan/sane/escl.c.covscan hplip-3.23.3/scan/sane/escl.c
--- hplip-3.23.3/scan/sane/escl.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/escl.c 2023-05-29 13:58:10.972395197 +0200
@@ -849,7 +849,7 @@ SANE_Status escl_control_option(SANE_Han
//DBG8("escl_control_option (option=%s) action=%d\n", ps->option[option].name, action);
if (stat != SANE_STATUS_GOOD)
{
- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
+ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
}
return stat;
@@ -1159,7 +1159,7 @@ void escl_close(SANE_Handle handle)
if (ps == NULL || ps != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
diff -up hplip-3.23.3/scan/sane/http.c.covscan hplip-3.23.3/scan/sane/http.c
--- hplip-3.23.3/scan/sane/http.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/http.c 2023-05-29 13:58:10.973395191 +0200
@@ -36,6 +36,7 @@
#include <string.h>
#include <syslog.h>
#include <ctype.h>
+#include <unistd.h>
#include "hpmud.h"
#include "http.h"
diff -up hplip-3.23.3/scan/sane/io.c.covscan hplip-3.23.3/scan/sane/io.c
--- hplip-3.23.3/scan/sane/io.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/io.c 2023-05-29 13:58:10.973395191 +0200
@@ -50,7 +50,7 @@ int __attribute__ ((visibility ("hidden"
if (dbus_error_is_set(&dbus_err))
{
- BUG("dBus Connection Error (%s)!\n", dbus_err.message);
+ BUG_SCAN("dBus Connection Error (%s)!\n", dbus_err.message);
dbus_error_free(&dbus_err);
}
@@ -79,7 +79,7 @@ int __attribute__ ((visibility ("hidden"
if (NULL == msg)
{
- BUG("dbus message is NULL!\n");
+ BUG_SCAN("dbus message is NULL!\n");
return 0;
}
@@ -94,7 +94,7 @@ int __attribute__ ((visibility ("hidden"
if (!dbus_connection_send(dbus_conn, msg, NULL))
{
- BUG("dbus message send failed!\n");
+ BUG_SCAN("dbus message send failed!\n");
return 0;
}
diff -up hplip-3.23.3/scan/sane/ledm.c.covscan hplip-3.23.3/scan/sane/ledm.c
--- hplip-3.23.3/scan/sane/ledm.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/ledm.c 2023-05-29 13:58:10.973395191 +0200
@@ -813,7 +813,7 @@ SANE_Status ledm_control_option(SANE_Han
if (stat != SANE_STATUS_GOOD)
{
- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
+ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name, action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
}
return stat;
@@ -1078,7 +1078,7 @@ void ledm_close(SANE_Handle handle)
if (ps == NULL || ps != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
diff -up hplip-3.23.3/scan/sane/marvell.c.covscan hplip-3.23.3/scan/sane/marvell.c
--- hplip-3.23.3/scan/sane/marvell.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/marvell.c 2023-05-29 13:58:10.976395173 +0200
@@ -134,7 +134,7 @@ static int get_ip_data(struct marvell_se
if (!ps->ip_handle)
{
- BUG("invalid ipconvert state\n");
+ BUG_SCAN("invalid ipconvert state\n");
goto bugout;
}
@@ -335,7 +335,7 @@ static struct marvell_session *create_se
if ((ps = malloc(sizeof(struct marvell_session))) == NULL)
{
- BUG("malloc failed: %m\n");
+ BUG_SCAN("malloc failed: %m\n");
return NULL;
}
memset(ps, 0, sizeof(struct marvell_session));
@@ -402,7 +402,7 @@ SANE_Status marvell_open(SANE_String_Con
if (session)
{
- BUG("session in use\n");
+ BUG_SCAN("session in use\n");
return SANE_STATUS_DEVICE_BUSY;
}
@@ -431,7 +431,7 @@ SANE_Status marvell_open(SANE_String_Con
if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
{
- BUG("unable to open device %s\n", session->uri);
+ BUG_SCAN("unable to open device %s\n", session->uri);
goto bugout;
free(session);
@@ -441,7 +441,7 @@ SANE_Status marvell_open(SANE_String_Con
if (hpmud_open_channel(session->dd, HPMUD_S_MARVELL_SCAN_CHANNEL, &session->cd) != HPMUD_R_OK)
{
- BUG("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri);
+ BUG_SCAN("unable to open %s channel %s\n", HPMUD_S_MARVELL_SCAN_CHANNEL, session->uri);
stat = SANE_STATUS_DEVICE_BUSY;
goto bugout;
}
@@ -554,7 +554,7 @@ void marvell_close(SANE_Handle handle)
if (ps == NULL || ps != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
@@ -849,7 +849,7 @@ SANE_Status marvell_control_option(SANE_
stat = SANE_STATUS_GOOD;
break;
}
- BUG("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max);
+ BUG_SCAN("value=%d brymin=%d brymax=%d\n", *int_value, ps->bryRange.min, ps->bryRange.max);
}
else
{ /* Set default. */
@@ -866,7 +866,7 @@ SANE_Status marvell_control_option(SANE_
if (stat != SANE_STATUS_GOOD)
{
- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name,
+ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name,
action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
}
@@ -905,7 +905,7 @@ SANE_Status marvell_start(SANE_Handle ha
if (set_extents(ps))
{
- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
+ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
stat = SANE_STATUS_INVAL;
goto bugout;
@@ -963,7 +963,7 @@ SANE_Status marvell_start(SANE_Handle ha
/* Open image processor. */
if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
{
- BUG("unable open image processor: err=%d\n", ret);
+ BUG_SCAN("unable open image processor: err=%d\n", ret);
stat = SANE_STATUS_INVAL;
goto bugout;
}
@@ -1023,7 +1023,7 @@ SANE_Status marvell_read(SANE_Handle han
if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
{
- BUG("ipConvert error=%x\n", ret);
+ BUG_SCAN("ipConvert error=%x\n", ret);
goto bugout;
}
diff -up hplip-3.23.3/scan/sane/sclpml.c.covscan hplip-3.23.3/scan/sane/sclpml.c
--- hplip-3.23.3/scan/sane/sclpml.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/sclpml.c 2023-05-29 13:58:10.976395173 +0200
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
+#include <sys/time.h>
#include "sane.h"
#include "saneopts.h"
#include "common.h"
@@ -2090,7 +2091,7 @@ void sclpml_close(SANE_Handle handle)
DBG(8, "sane_hpaio_close(): %s %d\n", __FILE__, __LINE__);
if (hpaio == NULL || hpaio != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
diff -up hplip-3.23.3/scan/sane/soap.c.covscan hplip-3.23.3/scan/sane/soap.c
--- hplip-3.23.3/scan/sane/soap.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/soap.c 2023-05-29 13:58:10.977395167 +0200
@@ -142,7 +142,7 @@ static int get_ip_data(struct soap_sessi
if (!ps->ip_handle)
{
- BUG("invalid ipconvert state\n");
+ BUG_SCAN("invalid ipconvert state\n");
goto bugout;
}
@@ -219,7 +219,7 @@ static struct soap_session *create_sessi
if ((ps = malloc(sizeof(struct soap_session))) == NULL)
{
- BUG("malloc failed: %m\n");
+ BUG_SCAN("malloc failed: %m\n");
return NULL;
}
memset(ps, 0, sizeof(struct soap_session));
@@ -418,7 +418,7 @@ SANE_Status soap_open(SANE_String_Const
if (session)
{
- BUG("session in use\n");
+ BUG_SCAN("session in use\n");
return SANE_STATUS_DEVICE_BUSY;
}
@@ -434,7 +434,7 @@ SANE_Status soap_open(SANE_String_Const
if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
{
- BUG("unable to open device %s\n", session->uri);
+ BUG_SCAN("unable to open device %s\n", session->uri);
goto bugout;
free(session);
@@ -519,7 +519,7 @@ void soap_close(SANE_Handle handle)
if (ps == NULL || ps != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
@@ -824,7 +824,7 @@ SANE_Status soap_control_option(SANE_Han
if (stat != SANE_STATUS_GOOD)
{
- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name,
+ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name,
action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
}
@@ -862,7 +862,7 @@ SANE_Status soap_start(SANE_Handle handl
ps->user_cancel = 0;
if (set_extents(ps))
{
- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
+ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
stat = SANE_STATUS_INVAL;
goto bugout;
@@ -913,7 +913,7 @@ SANE_Status soap_start(SANE_Handle handl
/* Open image processor. */
if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
{
- BUG("unable open image processor: err=%d\n", ret);
+ BUG_SCAN("unable open image processor: err=%d\n", ret);
stat = SANE_STATUS_INVAL;
goto bugout;
}
@@ -955,7 +955,7 @@ SANE_Status soap_start(SANE_Handle handl
if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE))
{
- BUG("ipConvert error=%x\n", ret);
+ BUG_SCAN("ipConvert error=%x\n", ret);
stat = SANE_STATUS_IO_ERROR;
goto bugout;
}
@@ -1007,7 +1007,7 @@ SANE_Status soap_read(SANE_Handle handle
if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
{
- BUG("ipConvert error=%x\n", ret);
+ BUG_SCAN("ipConvert error=%x\n", ret);
goto bugout;
}
diff -up hplip-3.23.3/scan/sane/soapht.c.covscan hplip-3.23.3/scan/sane/soapht.c
--- hplip-3.23.3/scan/sane/soapht.c.covscan 2023-03-28 09:26:11.000000000 +0200
+++ hplip-3.23.3/scan/sane/soapht.c 2023-05-29 13:58:10.977395167 +0200
@@ -136,7 +136,7 @@ static int get_ip_data(struct soap_sessi
if (!ps->ip_handle)
{
- BUG("invalid ipconvert state\n");
+ BUG_SCAN("invalid ipconvert state\n");
goto bugout;
}
@@ -435,7 +435,7 @@ static struct soap_session *create_sessi
if ((ps = malloc(sizeof(struct soap_session))) == NULL)
{
- BUG("malloc failed: %m\n");
+ BUG_SCAN("malloc failed: %m\n");
return NULL;
}
memset(ps, 0, sizeof(struct soap_session));
@@ -459,7 +459,7 @@ SANE_Status soapht_open(SANE_String_Cons
if (session)
{
- BUG("session in use\n");
+ BUG_SCAN("session in use\n");
return SANE_STATUS_DEVICE_BUSY;
}
@@ -475,7 +475,7 @@ SANE_Status soapht_open(SANE_String_Cons
if (hpmud_open_device(session->uri, ma.mfp_mode, &session->dd) != HPMUD_R_OK)
{
- BUG("unable to open device %s\n", session->uri);
+ BUG_SCAN("unable to open device %s\n", session->uri);
goto bugout;
free(session);
@@ -554,7 +554,7 @@ void soapht_close(SANE_Handle handle)
if (ps == NULL || ps != session)
{
- BUG("invalid sane_close\n");
+ BUG_SCAN("invalid sane_close\n");
return;
}
@@ -904,7 +904,7 @@ SANE_Status soapht_control_option(SANE_H
if (stat != SANE_STATUS_GOOD)
{
- BUG("control_option failed: option=%s action=%s\n", ps->option[option].name,
+ BUG_SCAN("control_option failed: option=%s action=%s\n", ps->option[option].name,
action==SANE_ACTION_GET_VALUE ? "get" : action==SANE_ACTION_SET_VALUE ? "set" : "auto");
}
@@ -946,7 +946,7 @@ SANE_Status soapht_start(SANE_Handle han
if (set_extents(ps))
{
- BUG("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
+ BUG_SCAN("invalid extents: tlx=%d brx=%d tly=%d bry=%d minwidth=%d minheight%d maxwidth=%d maxheight=%d\n",
ps->currentTlx, ps->currentTly, ps->currentBrx, ps->currentBry, ps->min_width, ps->min_height, ps->tlxRange.max, ps->tlyRange.max);
stat = SANE_STATUS_INVAL;
goto bugout;
@@ -1032,7 +1032,7 @@ SANE_Status soapht_start(SANE_Handle han
/* Open image processor. */
if ((ret = ipOpen(pXform-xforms, xforms, 0, &ps->ip_handle)) != IP_DONE)
{
- BUG("unable open image processor: err=%d\n", ret);
+ BUG_SCAN("unable open image processor: err=%d\n", ret);
stat = SANE_STATUS_INVAL;
goto bugout;
}
@@ -1075,7 +1075,7 @@ SANE_Status soapht_start(SANE_Handle han
if (ret & (IP_INPUT_ERROR | IP_FATAL_ERROR | IP_DONE))
{
- BUG("ipConvert error=%x\n", ret);
+ BUG_SCAN("ipConvert error=%x\n", ret);
stat = SANE_STATUS_IO_ERROR;
goto bugout;
}
@@ -1124,7 +1124,7 @@ SANE_Status soapht_read(SANE_Handle hand
if(ret & (IP_INPUT_ERROR | IP_FATAL_ERROR))
{
- BUG("ipConvert error=%x\n", ret);
+ BUG_SCAN("ipConvert error=%x\n", ret);
goto bugout;
}

View file

@ -0,0 +1,114 @@
diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
index 57d1dde..3475929 100644
--- a/scan/sane/hpaio.c
+++ b/scan/sane/hpaio.c
@@ -379,7 +379,7 @@ extern SANE_Status sane_hpaio_get_devices(const SANE_Device ***deviceList, SANE_
ResetDeviceList(&DeviceList);
DevDiscovery(localOnly);
*deviceList = (const SANE_Device **)DeviceList;
- SANE_Device*** devList;
+ const SANE_Device*** devList;
orblite_get_devices(devList, localOnly);
return SANE_STATUS_GOOD;
diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c
index 2eb7aba..4eaa468 100644
--- a/scan/sane/orblite.c
+++ b/scan/sane/orblite.c
@@ -64,28 +64,28 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_SCAN_TL_X, SANE_TITLE_SCAN_TL_X, SANE_DESC_SCAN_TL_X, // name, title, desc
SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeLeft // constraint_type, constraint
+ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeLeft // constraint_type, constraint
},
{
SANE_NAME_SCAN_TL_Y, SANE_TITLE_SCAN_TL_Y, SANE_DESC_SCAN_TL_Y, // name, title, desc
SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeTop // constraint_type, constraint
+ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeTop // constraint_type, constraint
},
{
SANE_NAME_SCAN_BR_X, SANE_TITLE_SCAN_BR_X, SANE_DESC_SCAN_BR_X, // name, title, desc
SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeRight // constraint_type, constraint
+ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeRight // constraint_type, constraint
},
{
SANE_NAME_SCAN_BR_Y, SANE_TITLE_SCAN_BR_Y, SANE_DESC_SCAN_BR_Y, // name, title, desc
SANE_TYPE_FIXED, SANE_UNIT_MM, sizeof(SANE_Fixed),// type, unit, size
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_RANGE, (SANE_Char**)&SANE_rangeBottom // constraint_type, constraint
+ SANE_CONSTRAINT_RANGE, (const SANE_Char**)&SANE_rangeBottom // constraint_type, constraint
},
// optResolution, // resolution group
@@ -93,7 +93,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_SCAN_RESOLUTION, SANE_TITLE_SCAN_RESOLUTION, SANE_DESC_SCAN_RESOLUTION, // name, title, desc
SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word), // type, unit, size,
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
+ SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
},
// optMode, // color/depth group
@@ -101,7 +101,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_SCAN_MODE, SANE_TITLE_SCAN_MODE, SANE_DESC_SCAN_MODE, // name, title, desc
SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_modes // constraint type, constraint
+ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_modes // constraint type, constraint
},
// optSource,
@@ -109,7 +109,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_SCAN_SOURCE, SANE_TITLE_SCAN_SOURCE, SANE_DESC_SCAN_SOURCE, // name, title, desc
SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_sources // constraint type, constraint
+ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_sources // constraint type, constraint
},
// optPaperSize,
@@ -117,7 +117,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
SANE_TYPE_STRING, SANE_UNIT_NONE, 256, // type, unit, size,
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_STRING_LIST, (SANE_Char**)SANE_paper_sizes // constraint type, constraint
+ SANE_CONSTRAINT_STRING_LIST, (const SANE_Char**)SANE_paper_sizes // constraint type, constraint
},
// optPaperSize,
@@ -125,7 +125,7 @@ SANE_Option_Descriptor DefaultOrbOptions[] = {
SANE_NAME_PAPER_SIZE, SANE_TITLE_PAPER_SIZE, SANE_DESC_PAPER_SIZE, // name, title, desc
SANE_TYPE_INT, SANE_UNIT_DPI, sizeof(SANE_Word), // type, unit, size,
SANE_CAP_SOFT_SELECT | SANE_CAP_SOFT_DETECT, // cap(ability)
- SANE_CONSTRAINT_WORD_LIST, (SANE_Char**)SANE_resolutions // constraint type, constraint
+ SANE_CONSTRAINT_WORD_LIST, (const SANE_Char**)SANE_resolutions // constraint type, constraint
},
#ifdef NOTDEF
// default template
@@ -274,6 +274,7 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle)
SANE_Auth_Callback authorize;
const SANE_Device *** device_list;
SANE_Bool local_only;
+ void * temp_handle;
// Allocate handle, set all handle values to zero
@@ -305,7 +306,9 @@ orblite_open (SANE_String_Const devicename, SANE_Handle * handle)
if (stat != SANE_STATUS_GOOD)
return stat;
- stat = g_handle->bb_orblite_open(devicename, &g_handle);
+ temp_handle = g_handle;
+ stat = g_handle->bb_orblite_open(devicename, &temp_handle);
+ g_handle = temp_handle;
if (stat == SANE_STATUS_GOOD)
*handle = g_handle;

View file

@ -0,0 +1,16 @@
--- ./Makefile.am.orig 2024-05-10 18:14:51.431337550 -0500
+++ ./Makefile.am 2024-05-10 18:15:37.078338571 -0500
@@ -306,13 +306,6 @@
pcarddir = $(hplipdir)/pcard
dist_pcard_DATA = pcard/__init__.py pcard/photocard.py
-# pcardext
-pcardextdir = $(pyexecdir)
-pcardext_LTLIBRARIES = pcardext.la
-pcardext_la_LDFLAGS = -module -avoid-version
-pcardext_la_SOURCES = pcard/pcardext/pcardext.c pcard/fat.c pcard/pcardext/pcardext.h
-pcardext_la_CFLAGS = -I$(PYTHONINCLUDEDIR)
-
# prnt
prntdir = $(hplipdir)/prnt
dist_prnt_DATA = prnt/cups.py prnt/__init__.py prnt/ldl.py prnt/pcl.py prnt/colorcal.py

View file

@ -0,0 +1,17 @@
prnt/pserror.c: Replace an implicit int with an explicit int
Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875>
diff --git a/prnt/hpps/pserror.c b/prnt/hpps/pserror.c
index 114d7e1b5fa364fb..493b49c27917a7e6 100644
--- a/prnt/hpps/pserror.c
+++ b/prnt/hpps/pserror.c
@@ -24,7 +24,7 @@ extern char *program ; /* Defined by main program, giving program name */
void message(int flags, char *format, ...)
{
va_list args ;
- static column = 0 ; /* current screen column for message wrap */
+ static int column = 0 ; /* current screen column for message wrap */
char msgbuf[MAX_MESSAGE] ; /* buffer in which to put the message */
char *bufptr = msgbuf ; /* message buffer pointer */

View file

@ -0,0 +1,19 @@
scam/sane/hpaio.c: Include orblite.h for more function prototypes
Otherwise the build fails with compilers which do not support
implicit function declarations.
Submitted upstream: <https://bugs.launchpad.net/hplip/+bug/1997875>
diff --git a/scan/sane/hpaio.c b/scan/sane/hpaio.c
index d342626822fc2190..57d1ddea32fb5816 100644
--- a/scan/sane/hpaio.c
+++ b/scan/sane/hpaio.c
@@ -50,6 +50,7 @@
#include "sclpml.h"
#include "escl.h"
#include "io.h"
+#include "orblite.h"
#include "orblitei.h"

View file

@ -0,0 +1,21 @@
diff --git a/scan/sane/orblite.c b/scan/sane/orblite.c
index ba86640..2eb7aba 100644
--- a/scan/sane/orblite.c
+++ b/scan/sane/orblite.c
@@ -20,6 +20,7 @@
#include "orblitei.h"
#include "orblite.h"//Added New
#include <math.h>
+#include <dlfcn.h>
#include "utils.h"
#include "io.h"
@@ -195,7 +196,7 @@ bugout:
static int bb_unload(SANE_THandle ps)
{
- _DBG("Calling orblite bb_unload: \n");
+ DBG("Calling orblite bb_unload: \n");
if (ps->bb_handle)
{
dlclose(ps->bb_handle);

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
#SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=incompatible-pointer-types"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@ -86,6 +89,16 @@ zcat $CWD/hplip.python3.shebang.diff.gz | patch -p1 --verbose || exit 1
# Fix the desktop file to show correct icon and category
zcat $CWD/fix-desktop-file.patch.gz | patch -p1 --verbose || exit 1
# GCC 14 fixes:
cat $CWD/hplip-pserror-c99.patch | patch -p1 --verbose || exit 1
cat $CWD/hplip-hpaio-gcc14.patch | patch -p1 --verbose || exit 1
cat $CWD/hplip-covscan.patch | patch -p1 --verbose || exit 1
cat $CWD/hplip-scan-orblite-c99.patch | patch -p1 --verbose || exit 1
cat $CWD/hplip-scan-hpaio-include.patch | patch -p1 --verbose || exit 1
# This extension was never ported to python3:
cat $CWD/hplip-pcardext-disable.patch | patch -p1 --verbose || exit 1
# Choose correct options depending on whether PAM is installed:
if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
unset SHADOW_OPTIONS
@ -203,4 +216,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz

View file

@ -64,6 +64,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion -Wno-error=incompatible-pointer-types"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP

View file

@ -55,6 +55,9 @@ else
SLKCFLAGS="-O2"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
TMP=${TMP:-/tmp}
PKG=$TMP/package-rzip

View file

@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
export CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -87,6 +87,7 @@ find . \
# Old software, modern compiler:
zcat $CWD/sc-7.16-3.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/sc.gcc14.diff.gz | patch -p1 --verbose || exit 1
# Build:
make $NUMJOBS || exit 1

View file

@ -0,0 +1,11 @@
--- ./Makefile.orig 2024-05-11 16:51:27.919158388 -0500
+++ ./Makefile 2024-05-11 16:53:10.235160676 -0500
@@ -336,7 +336,7 @@
# real effect on the reliability of the program, but may concern some
# people who don't understand them.
#CFLAGS=-DSYSV3 -O2 -Wall -pipe
-CFLAGS=-DSYSV3 -O2 -pipe
+CFLAGS=-DSYSV3 -O2 -pipe -Wno-error=implicit-function-declaration -Wno-error=implicit-int
LIB=-lm -lncurses
# All of the source files

View file

@ -73,7 +73,7 @@ find . \
( cd libjpeg-6a ; ./configure ; make || exit 1 ) || exit 1
ln -sf libjpeg-6a jpeglib
make seejpeg || exit 1
CFLAGS="-Wno-error=incompatible-pointer-types" make seejpeg || exit 1
strip seejpeg
cat seejpeg > $PKG/usr/bin/seejpeg
@ -89,4 +89,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
# Build the package:
cd $PKG
/sbin/makepkg -l y -c n $TMP/seejpeg-$VERSION-$ARCH-$BUILD.txz

View file

@ -52,6 +52,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
TAG="_alsa"

View file

@ -69,6 +69,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
rm -rf $PKG
mkdir -p $TMP $PKG

View file

@ -0,0 +1,44 @@
Avoid incompatible pointer types in terminfo global variable checks.
Some compilers reject these incompatible pointer types, causing the
checks to always fail, when these variables are in fact available.
Submitted upstream: <https://www.zsh.org/mla/workers/2023/msg01112.html>
diff --git a/configure.ac b/configure.ac
index a58242f453b4a8f3..5534f42df14eb28c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1769,27 +1769,27 @@ if test x$zsh_cv_path_term_header != xnone; then
fi
AC_MSG_CHECKING(if boolcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolcodes; puts(*test);]])],[AC_DEFINE(HAVE_BOOLCODES) boolcodes=yes],[boolcodes=no])
AC_MSG_RESULT($boolcodes)
AC_MSG_CHECKING(if numcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numcodes; puts(*test);]])],[AC_DEFINE(HAVE_NUMCODES) numcodes=yes],[numcodes=no])
AC_MSG_RESULT($numcodes)
AC_MSG_CHECKING(if strcodes is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strcodes; puts(*test);]])],[AC_DEFINE(HAVE_STRCODES) strcodes=yes],[strcodes=no])
AC_MSG_RESULT($strcodes)
AC_MSG_CHECKING(if boolnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)boolnames; puts(*test);]])],[AC_DEFINE(HAVE_BOOLNAMES) boolnames=yes],[boolnames=no])
AC_MSG_RESULT($boolnames)
AC_MSG_CHECKING(if numnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)numnames; puts(*test);]])],[AC_DEFINE(HAVE_NUMNAMES) numnames=yes],[numnames=no])
AC_MSG_RESULT($numnames)
AC_MSG_CHECKING(if strnames is available)
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[$term_includes]], [[char **test = (char **)strnames; puts(*test);]])],[AC_DEFINE(HAVE_STRNAMES) strnames=yes],[strnames=no])
AC_MSG_RESULT($strnames)
dnl There are apparently defective terminal library headers on some

View file

@ -77,6 +77,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
cat $CWD/0007-zsh-configure-c99.patch | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \

View file

@ -61,6 +61,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"
# Don't use icecream:
PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")

View file

@ -64,6 +64,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch"
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@ -79,6 +82,7 @@ find . \
#Does not compile with changed CFLAGS
#CC="gcc" make CFLAGS="-Wall -Wstrict-prototypes $SLKCFLAGS -g" DIST=$PKG || exit 1
GCCFLAG="$SLKCFLAGS" \
CC="gcc" \
make \
DIST=$PKG MANDIR=/usr/man LIBDIR=/usr/lib${LIBDIRSUFFIX}/bcc \

View file

@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -fpermissive"
TMP=${TMP:-/tmp}
PKG=$TMP/package-oprofile

View file

@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=int-conversion"
TMP=${TMP:-/tmp}
PKG=$TMP/package-subversion

View file

@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP

View file

@ -64,6 +64,10 @@ else
SLKCFLAGS="-O2"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
export CFLAGS="$SLKCFLAGS"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -84,6 +84,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
# Configure:
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \

View file

@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
TMP=${TMP:-/tmp}
PKG=$TMP/package-apr-util
@ -84,7 +87,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--with-apr=/usr \
--with-dbm=db44 \
--with-berkeley-db \
--with-berkeley-db=/usr \
--with-mysql=/usr \
--disable-util-dso \
--without-gdbm \

View file

@ -64,6 +64,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP

View file

@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1

View file

@ -59,6 +59,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion"
# If PulseAudio is not found, use the _alsa $TAG and disable it in the build:
if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
TAG="_alsa"

View file

@ -90,6 +90,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration"
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \

View file

@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int"
rm -rf $PKG
mkdir -p $TMP $PKG/usr
cd $TMP

View file

@ -69,6 +69,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -60,6 +60,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=incompatible-pointer-types"
TMP=${TMP:-/tmp}
PKG=$TMP/package-lcms

View file

@ -44,6 +44,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
# If this package is being built for ALSA (no PulseAudio), use the _alsa $TAG:
if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then
TAG="_alsa"
@ -73,8 +76,10 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
CFLAGS="$SLKCFLAGS" \
./autogen.sh || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \

View file

@ -68,6 +68,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM

View file

@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1

View file

@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-int"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1

View file

@ -65,6 +65,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1

View file

@ -88,6 +88,9 @@ zcat $CWD/netpbm-manfix.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/netpbm-manual-pages.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/netpbm-libdir-so.patch.gz | patch -p1 --verbose || exit 1
# GCC 14 "fix":
cat $CWD/netpbm.gcc14.diff | patch -p1 --verbose || exit 1
# Send blank lines to "configure" to just take defaults:
./configure << EOF

View file

@ -0,0 +1,11 @@
--- ./buildtools/configure.pl.orig 2024-04-12 12:11:55.000000000 -0500
+++ ./buildtools/configure.pl 2024-05-10 19:05:04.538404953 -0500
@@ -1537,7 +1537,7 @@
" -pedantic -fno-common " .
"-Wall -Wno-uninitialized -Wmissing-declarations -Wimplicit " .
"-Wwrite-strings -Wmissing-prototypes -Wundef " .
- "-Wno-unknown-pragmas ";
+ "-Wno-unknown-pragmas -Wno-error=incompatible-pointer-types ";
if (wnostrictoverflowWorks($gccCommandName)) {
# The compiler generates some optimizations based on the assumption

View file

@ -0,0 +1,11 @@
--- pilot-link-0.12.1/libpisock/dlp.c.pom 2006-08-27 18:20:17.000000000 +0200
+++ pilot-link-0.12.1/libpisock/dlp.c 2006-11-30 13:39:29.000000000 +0100
@@ -2268,7 +2268,7 @@
if (errCode) {
LOG((PI_DBG_DLP, PI_DBG_LVL_INFO,
"DLP ReadFeature FtrGet error 0x%8.8lX\n",
- res));
+ errCode));
pi_set_palmos_error(sd, (int)errCode);
return pi_set_error(sd, PI_ERR_DLP_PALMOS);
}

View file

@ -0,0 +1,42 @@
diff -up pilot-link-0.12.5/libpisock/serial.c.pom pilot-link-0.12.5/libpisock/serial.c
--- pilot-link-0.12.5/libpisock/serial.c.pom 2006-10-12 16:21:22.000000000 +0200
+++ pilot-link-0.12.5/libpisock/serial.c 2010-06-24 10:35:48.000000000 +0200
@@ -286,7 +286,7 @@ pi_serial_connect(pi_socket_t *ps, struc
data->establishrate = data->rate = 57600;
}
- if ((err = data->impl.open(ps, pa, addrlen)) < 0)
+ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0)
return err; /* errno already set */
ps->raddr = malloc(addrlen);
@@ -362,7 +362,7 @@ pi_serial_bind(pi_socket_t *ps, struct s
}
begin:
- if ((err = data->impl.open(ps, pa, addrlen)) < 0) {
+ if ((err = (data->impl.open)(ps, pa, addrlen)) < 0) {
int save_errno = errno;
#ifdef MAXPATHLEN
char realport[MAXPATHLEN];
diff -up pilot-link-0.12.5/libpisock/usb.c.pom pilot-link-0.12.5/libpisock/usb.c
--- pilot-link-0.12.5/libpisock/usb.c.pom 2010-06-24 09:24:56.000000000 +0200
+++ pilot-link-0.12.5/libpisock/usb.c 2010-06-24 10:36:08.000000000 +0200
@@ -267,7 +267,7 @@ pi_usb_connect(pi_socket_t *ps, struct s
data->establishrate = data->rate = 57600;
}
- result = data->impl.open(ps, pa, addrlen);
+ result = (data->impl.open)(ps, pa, addrlen);
if (result < 0)
goto fail;
@@ -343,7 +343,7 @@ pi_usb_bind(pi_socket_t *ps, struct sock
data->establishrate = data->rate = 57600;
}
- result = data->impl.open(ps, pa, addrlen);
+ result = (data->impl.open)(ps, pa, addrlen);
if (result < 0)
return result;

View file

@ -0,0 +1,11 @@
diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.c
--- pilot-link-0.12.4/libpisock/usb.c.clio 2009-05-28 14:55:43.000000000 +0200
+++ pilot-link-0.12.4/libpisock/usb.c 2009-05-28 14:56:57.000000000 +0200
@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
.vendor = 0x054c,
.product = 0x0066,
.idstr = "Sony T, SJ series, and other Palm OS 4.0 devices",
+ .flags = USB_INIT_SONY_CLIE,
},
{

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,24 @@
diff -up pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 pilot-link-0.12.5/libpisock/md5.c
--- pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 2013-02-25 15:17:31.708780677 +0100
+++ pilot-link-0.12.5/libpisock/md5.c 2013-02-25 15:15:07.771861922 +0100
@@ -125,7 +125,7 @@ void MD5Final(UINT8 digest[16], struct M
byteSwap(ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
diff -up pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 pilot-link-0.12.5/popt/popthelp.c
--- pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 2004-08-25 17:06:39.000000000 +0200
+++ pilot-link-0.12.5/popt/popthelp.c 2013-02-25 15:16:34.593606516 +0100
@@ -683,7 +683,7 @@ static int showShortOptions(const struct
s[0] = '\0';
/*@-branchstate@*/ /* FIX: W2DO? */
if (str == NULL) {
- memset(s, 0, sizeof(s));
+ memset(s, 0, sizeof(*s));
str = s;
}
/*@=branchstate@*/

View file

@ -0,0 +1,22 @@
diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure
--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100
+++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200
@@ -2604,12 +2604,12 @@
enable_werror=no
-save_CFLAGS="$CFLAGS"
-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
-if test "x$CFLAGS" != "x$save_CFLAGS"; then
- enable_werror="yes"
-fi
+#save_CFLAGS="$CFLAGS"
+#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
+#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
+#if test "x$CFLAGS" != "x$save_CFLAGS"; then
+# enable_werror="yes"
+#fi
ac_aux_dir=

View file

@ -0,0 +1,13 @@
diff -up pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom pilot-link-0.12.5/doc/man/pilot-install-expenses.1
--- pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom 2010-02-07 04:43:11.000000000 +0100
+++ pilot-link-0.12.5/doc/man/pilot-install-expenses.1 2011-03-09 17:12:30.000000000 +0100
@@ -76,7 +76,7 @@ Add the number of attendees to the expen
\fB\-\-city\fR \fBSTRING\fR
.PP
-Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occured in\&.
+Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occurred in\&.
\fB\-n\fR,
\fB\-\-note\fR \fBSTRING\fR
diff -up pilot-link-0.12.5/doc/man/pilot-install-netsync.1.pom pilot-link-0.12.5/doc/man/pilot-install-netsync.1

View file

@ -0,0 +1,28 @@
Fix return types for PDA::Pilot::getRecords in the Perl bindings.
diff --git a/bindings/Perl/Pilot.xs b/bindings/Perl/Pilot.xs
index ef6865b710557fe8..424a24e64df8d2ae 100644
--- a/bindings/Perl/Pilot.xs
+++ b/bindings/Perl/Pilot.xs
@@ -2542,16 +2542,18 @@ resetNext(self)
OUTPUT:
RETVAL
-int
+SV *
getRecords(self)
PDA::Pilot::DLP::DB *self
CODE:
{
- int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL);
+ int retval;
+ int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &retval);
if (result < 0) {
RETVAL = newSVsv(&PL_sv_undef);
self->errnop = result;
- }
+ } else
+ RETVAL = newSViv(retval);
}
OUTPUT:
RETVAL

View file

@ -0,0 +1,30 @@
The standard iconv function expects a char ** type for its input
argument. Adjust the configure probe to avoid build failures
with future compilers.
diff --git a/configure b/configure
index d4031564da7e2184..a2e5877f8588059d 100755
--- a/configure
+++ b/configure
@@ -15859,7 +15859,7 @@ else
int main (int argc, char **argv)
{
- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9";
+ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9";
const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
char transbuf[10], *trans = transbuf;
iconv_t cd;
diff --git a/configure.ac b/configure.ac
index dc19311ce99f888a..ce9b310527e1a8dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,7 +458,7 @@ AC_CHECK_LIB(
int main (int argc, char **argv)
{
- const char *pc = "\x66\x66\x66\x66\x66\x66\x66\xA9";
+ char *pc = (char *) "\x66\x66\x66\x66\x66\x66\x66\xA9";
const char *utf8 = "\x66\x66\x66\x66\x66\x66\x66\xC2\xA9";
char transbuf[10], *trans = transbuf;
iconv_t cd;

View file

@ -70,8 +70,17 @@ rm -rf pilot-link-$VERSION
tar xvf $CWD/pilot-link-$VERSION.tar.bz2 || exit 1
cd pilot-link-$VERSION || exit 1
zcat $CWD/pilot-link.png14.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch.gz | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.1-var.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.2-open.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.3-clio.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-mp.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-redefinePerlsymbols.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-compiler_warnings.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-ftbfs-f19.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-aarch64.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-0.12.5-ftbfs-f21.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-configure-c99.patch | patch -p1 --verbose || exit 1
cat $CWD/pilot-link-c99.patch | patch -p1 --verbose || exit 1
chown -R root:root .
find . \

View file

@ -1,96 +0,0 @@
--- ./src/pilot-read-veo.c.orig 2007-02-04 17:06:03.000000000 -0600
+++ ./src/pilot-read-veo.c 2010-02-19 12:52:30.000000000 -0600
@@ -41,10 +41,6 @@
#ifdef HAVE_PNG
# include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-# define png_voidp_NULL (png_voidp)NULL
-# define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
#endif
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -856,8 +852,8 @@
png_infop info_ptr;
png_ptr = png_create_write_struct
- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ (PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if (!png_ptr)
return;
--- ./src/pilot-read-notepad.c.orig 2007-02-04 17:06:02.000000000 -0600
+++ ./src/pilot-read-notepad.c 2010-02-19 12:53:03.000000000 -0600
@@ -39,10 +39,6 @@
#ifdef HAVE_PNG
#include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
#endif
const char *progname;
@@ -166,8 +162,8 @@
width = n->body.width + 8;
png_ptr = png_create_write_struct
- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ ( PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if(!png_ptr)
return;
--- ./src/pilot-read-screenshot.c.orig 2006-11-02 08:54:31.000000000 -0600
+++ ./src/pilot-read-screenshot.c 2010-02-19 12:50:44.000000000 -0600
@@ -40,10 +40,6 @@
#ifdef HAVE_PNG
# include "png.h"
-# if (PNG_LIBPNG_VER < 10201)
-# define png_voidp_NULL (png_voidp)NULL
-# define png_error_ptr_NULL (png_error_ptr)NULL
-# endif
#endif
#define pi_mktag(c1,c2,c3,c4) (((c1)<<24)|((c2)<<16)|((c3)<<8)|(c4))
@@ -87,8 +83,8 @@
gray_buf = malloc( state->w );
png_ptr = png_create_write_struct
- (PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ (PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if (!png_ptr)
return;
--- ./src/pilot-read-palmpix.c.orig 2007-02-04 17:06:03.000000000 -0600
+++ ./src/pilot-read-palmpix.c 2010-02-19 12:51:10.000000000 -0600
@@ -42,10 +42,6 @@
#ifdef HAVE_PNG
#include "png.h"
-#if (PNG_LIBPNG_VER < 10201)
- #define png_voidp_NULL (png_voidp)NULL
- #define png_error_ptr_NULL (png_error_ptr)NULL
-#endif
#endif
const char *progname;
@@ -223,8 +219,8 @@
png_infop info_ptr;
png_ptr = png_create_write_struct
- ( PNG_LIBPNG_VER_STRING, png_voidp_NULL,
- png_error_ptr_NULL, png_error_ptr_NULL);
+ ( PNG_LIBPNG_VER_STRING, NULL,
+ NULL, NULL);
if(!png_ptr)
return;

View file

@ -67,6 +67,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=int-conversion"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP || exit 1

View file

@ -109,7 +109,7 @@ make install DESTDIR=$PKG || exit 1
# NOTE: This will link against the currently installed libreadline!
# Build/install this package twice whenever there is an .soname bump.
( cd examples/rlfe || exit 1
CFLAGS="$SLKCFLAGS" \
CFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=int-conversion" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \

View file

@ -66,6 +66,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"
TMP=${TMP:-/tmp}
PKG=$TMP/package-sdl

View file

@ -61,6 +61,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
TMP=${TMP:-/tmp}
PKG=$TMP/package-slang1
rm -rf $PKG
@ -83,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--includedir=/usr/include/slang1 \
--disable-static \
$ARCH-slackware-linux
$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1

View file

@ -58,6 +58,12 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=return-mismatch"
# From the Makefile.cfg:
SLKCFLAGS="$SLKCFLAGS -fomit-frame-pointer -O2 -fno-strength-reduce -pipe"
TMP=${TMP:-/tmp}
PKG=$TMP/package-svgalib
rm -rf $PKG
@ -92,6 +98,7 @@ zcat $CWD/svgalib-1.9.25-quickmath-h-redefinitions.patch.gz | patch -p1 --verbos
zcat $CWD/svgalib-1.9.21-demos.patch.gz | patch -p1 --verbose || exit 1
zcat $CWD/svgalib-1.9.25.no_asm.patch.gz | patch -p1 --verbose || exit 1
export CFLAGS="$SLKCFLAGS"
# Build and install - spamming your partition first...:
make install NO_HELPER=y || exit 1
make install \

View file

@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-int"
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}

View file

@ -65,6 +65,9 @@ elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=incompatible-pointer-types"
cd $TMP
rm -rf alpine-${VERSION}
tar xvf $CWD/alpine-$VERSION.tar.?z || exit 1

View file

@ -63,6 +63,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP

View file

@ -257,7 +257,7 @@ small=''
medium=''
large=''
huge=''
optimize='-O'
optimize='-O -Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=return-mismatch'
ccflags=''
cppflags=''
ldflags=''

View file

@ -64,6 +64,9 @@ else
LIBDIRSUFFIX=""
fi
# GCC 14 "fix":
SLKCFLAGS="$SLKCFLAGS -Wno-error=implicit-function-declaration"
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1

Some files were not shown because too many files have changed in this diff Show more