Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11,867 changes: 11,867 additions & 0 deletions base/patch/config-soviet-6.9.1

Large diffs are not rendered by default.

12,005 changes: 12,005 additions & 0 deletions base/patch/config-zen-6.10.10

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions base/patch/expect-5.45.4-format-security.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--- exp_clib.c.orig 2017-03-24 10:34:37.269183513 -0400
+++ exp_clib.c 2017-03-24 10:34:41.171117943 -0400
@@ -1938,8 +1938,8 @@
char *str;
{
if (exp_is_debugging) {
- fprintf(stderr,str);
- if (exp_logfile) fprintf(exp_logfile,str);
+ fprintf(stderr, "%s", str);
+ if (exp_logfile) fprintf(exp_logfile, "%s", str);
}
}

288 changes: 288 additions & 0 deletions base/patch/expect-5.45.4-gcc14-1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,288 @@
Submitted By: Xi Ruoyao <xry111@xry111.site>
Date: 2024-04-07
Initial Package Version: 5.45.4
Upstream Status: Submitted (for a long time), but the upstream seems
inactive
Origin: Fedora & Self:
- Fedora expect-5.45.4-covscan-fixes.patch
- Fedora expect-c99.patch
- Fedora expect-configure-c99.patch
- We are directly patching configure instead of
patching configure.in like Fedora. It's
generally not a good idea, but better than
adding autoconf into chapter 7 or bloating this
patch into 100+ KiB (with a full regeneration
of the configure script).
Description: Fix some build failure caused by the pre-C99 syntax
no longer allowed by GCC 14 in the default C99
mode.

--- a/configure 2018-02-04 18:43:58.000000000 +0800
+++ b/configure 2024-04-08 01:19:29.253548373 +0800
@@ -7994,7 +7994,6 @@
{
extern long timezone;
timezone += 1;
- exit (0);
;
return 0;
}
@@ -8030,7 +8029,6 @@
{
extern time_t timezone;
timezone += 1;
- exit (0);
;
return 0;
}
@@ -8791,7 +8789,7 @@
$as_echo_n "checking for memcpy... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
+#include <string.h>
int
main ()
{
@@ -8831,7 +8829,7 @@
/* end confdefs.h. */

#include <sys/wait.h>
-main() {
+int main() {
#ifndef WNOHANG
return 0;
#else
@@ -8867,7 +8865,7 @@

#include <stdio.h>
#include <sys/wait.h>
-main() {
+int main() {
#ifdef WNOHANG
FILE *fp = fopen("wnohang","w");
fprintf(fp,"%d",WNOHANG);
@@ -8935,7 +8933,9 @@
/* end confdefs.h. */

#include <signal.h>
-#define RETSIGTYPE $retsigtype
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>

int signal_rearms = 0;

@@ -8952,7 +8952,7 @@
signal_rearms++;
}

-main()
+int main()
{
signal(SIGINT,parent_sigint_handler);

@@ -9234,10 +9234,9 @@
/* end confdefs.h. */

#include <sgtty.h>
-main()
+int main()
{
struct sgttyb tmp;
- exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -9274,10 +9273,9 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <termio.h>
- main()
+ int main()
{
struct termio tmp;
- exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -9312,10 +9310,9 @@
# include <inttypes.h>
# endif
# include <termios.h>
- main()
+ int main()
{
struct termios tmp;
- exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
@@ -9350,7 +9347,7 @@
#include <inttypes.h>
#endif
#include <termios.h>
-main() {
+int main() {
#if defined(TCGETS) || defined(TCGETA)
return 0;
#else
@@ -9388,7 +9385,7 @@
#include <inttypes.h>
#endif
#include <termios.h>
-main() {
+int main() {
#ifdef TIOCGWINSZ
return 0;
#else
@@ -9423,7 +9420,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

-main(){
+int main(){
#ifdef CRAY
return 0;
#else
@@ -9565,12 +9562,10 @@

extern char *tzname[2];
extern int daylight;
-main()
+int main()
{
int *x = &daylight;
char **y = tzname;
-
- exit(0);
}
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
--- a/exp_chan.c 2018-02-03 03:15:52.000000000 +0800
+++ b/exp_chan.c 2024-04-07 21:56:43.663163369 +0800
@@ -58,7 +58,7 @@

Tcl_ChannelType expChannelType = {
"exp", /* Type name. */
- ExpBlockModeProc, /* Set blocking/nonblocking mode.*/
+ TCL_CHANNEL_VERSION_2,
ExpCloseProc, /* Close proc. */
ExpInputProc, /* Input proc. */
ExpOutputProc, /* Output proc. */
@@ -68,6 +68,7 @@
ExpWatchProc, /* Initialize notifier. */
ExpGetHandleProc, /* Get OS handles out of channel. */
NULL, /* Close2 proc */
+ ExpBlockModeProc, /* Set blocking/nonblocking mode.*/
};

typedef struct ThreadSpecificData {

diff -up expect5.45.4/exp_chan.c.orig expect5.45.4/exp_chan.c
--- expect5.45.4/exp_chan.c.orig 2018-02-02 20:15:52.000000000 +0100
+++ expect5.45.4/exp_chan.c 2018-10-09 14:14:44.851965292 +0200
@@ -51,6 +51,8 @@ static void ExpWatchProc _ANSI_ARGS_((C
int mask));
static int ExpGetHandleProc _ANSI_ARGS_((ClientData instanceData,
int direction, ClientData *handlePtr));
+void exp_background_channelhandler _ANSI_ARGS_((ClientData,
+ int));

/*
* This structure describes the channel type structure for Expect-based IO:
diff -up expect5.45.4/exp_clib.c.orig expect5.45.4/exp_clib.c
--- expect5.45.4/exp_clib.c.orig 2018-10-09 14:14:44.841965281 +0200
+++ expect5.45.4/exp_clib.c 2018-10-09 14:14:44.873965319 +0200
@@ -37,6 +37,14 @@ would appreciate credit if this program
# endif
#endif

+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+//#ifdef HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+//#endif
+
#ifdef HAVE_SYS_FCNTL_H
# include <sys/fcntl.h>
#else
@@ -2196,6 +2204,7 @@ int exp_getptyslave();
#define sysreturn(x) return(errno = x, -1)

void exp_init_pty();
+void exp_init_tty();

/*
The following functions are linked from the Tcl library. They
@@ -2715,6 +2724,7 @@ exp_spawnl TCL_VARARGS_DEF(char *,arg1)
argv[i] = va_arg(args,char *);
if (!argv[i]) break;
}
+ va_end(args);
i = exp_spawnv(argv[0],argv+1);
free((char *)argv);
return(i);
@@ -3188,6 +3198,7 @@ exp_expectl TCL_VARARGS_DEF(int,arg1)
/* Ultrix 4.2 compiler refuses enumerations comparison!? */
if ((int)type < 0 || (int)type >= (int)exp_bogus) {
fprintf(stderr,"bad type (set %d) in exp_expectl\n",i);
+ va_end(args);
sysreturn(EINVAL);
}

@@ -3253,6 +3264,7 @@ exp_fexpectl TCL_VARARGS_DEF(FILE *,arg1
/* Ultrix 4.2 compiler refuses enumerations comparison!? */
if ((int)type < 0 || (int)type >= (int)exp_bogus) {
fprintf(stderr,"bad type (set %d) in exp_expectl\n",i);
+ va_end(args);
sysreturn(EINVAL);
}

diff -up expect5.45.4/exp_log.c.orig expect5.45.4/exp_log.c
--- expect5.45.4/exp_log.c.orig 2018-10-09 14:14:44.838965277 +0200
+++ expect5.45.4/exp_log.c 2018-10-09 14:14:44.852965294 +0200
@@ -174,7 +174,10 @@ expStdoutLog TCL_VARARGS_DEF(int,arg1)
force_stdout = TCL_VARARGS_START(int,arg1,args);
fmt = va_arg(args,char *);

- if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) return;
+ if ((!tsdPtr->logUser) && (!force_stdout) && (!tsdPtr->logAll)) {
+ va_end(args);
+ return;
+ }

(void) vsnprintf(bigbuf,sizeof(bigbuf),fmt,args);
expDiagWriteBytes(bigbuf,-1);
diff -up expect5.45.4/exp_main_sub.c.orig expect5.45.4/exp_main_sub.c
--- expect5.45.4/exp_main_sub.c.orig 2018-10-09 14:14:44.848965289 +0200
+++ expect5.45.4/exp_main_sub.c 2018-10-09 14:14:44.852965294 +0200
@@ -57,6 +57,7 @@ int exp_cmdlinecmds = FALSE;
int exp_interactive = FALSE;
int exp_buffer_command_input = FALSE;/* read in entire cmdfile at once */
int exp_fgets();
+int exp_tty_cooked_echo(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);

Tcl_Interp *exp_interp; /* for use by signal handlers who can't figure out */
/* the interpreter directly */
diff -up expect5.45.4/pty_termios.c.orig expect5.45.4/pty_termios.c
--- expect5.45.4/pty_termios.c.orig 2018-10-09 14:17:00.132127498 +0200
+++ expect5.45.4/pty_termios.c 2018-10-09 14:33:59.393315570 +0200
@@ -105,6 +105,7 @@ with openpty which supports 4000 while p

void expDiagLog();
void expDiagLogPtr();
+char *expErrnoMsg(int errorNo);

#include <errno.h>
/*extern char *sys_errlist[];*/
@@ -189,6 +190,7 @@ static char slave_name[MAXPTYNAMELEN];
#endif /* HAVE_SCO_CLIST_PTYS */

#ifdef HAVE_OPENPTY
+#include <pty.h>
static char master_name[64];
static char slave_name[64];
#endif
27 changes: 27 additions & 0 deletions base/patch/gptfdisk-1.0.10-convenience-1.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
Date: 2015-10-19
Initial Package Version: 1.0.1
Upstream Status: None. BLFS specific.
Origin: BLFS
Description: Updates Makefile enabling parameter passing.
Rediffed for version 1.0.1
Updates: Rediffed for version 1.0.3 (P. Labastie)
Patch version 2 for version 1.0.3: Removed ICU
and POPT switches, keeping only the
install target (P. Labastie)

diff -Naur gptfdisk-1.0.3.old/Makefile gptfdisk-1.0.3.new/Makefile
--- gptfdisk-1.0.3.old/Makefile 2017-07-28 03:41:20.000000000 +0200
+++ gptfdisk-1.0.3.new/Makefile 2018-04-20 10:04:18.896802047 +0200
@@ -37,6 +37,11 @@
clean: #no pre-reqs
rm -f core *.o *~ gdisk sgdisk cgdisk fixparts

+install: gdisk cgdisk sgdisk fixparts
+ install -dm 755 $(DESTDIR)/sbin $(DESTDIR)/usr/share/man/man8
+ install -m755 gdisk cgdisk sgdisk fixparts $(DESTDIR)/sbin
+ install -m644 *.8 $(DESTDIR)/usr/share/man/man8
+
# what are the source dependencies
depend: $(SRCS)
$(DEPEND) $(SRCS)
58 changes: 58 additions & 0 deletions base/patch/ncurses-6.3-libs.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
diff -ruN a/c++/Makefile.in b/c++/Makefile.in
--- a/c++/Makefile.in 2021-07-03 20:53:57.000000000 +0200
+++ b/c++/Makefile.in 2021-11-03 10:58:04.147647447 +0100
@@ -118,7 +118,7 @@
-l@FORM_NAME@@USE_LIB_SUFFIX@ \
-l@MENU_NAME@@USE_LIB_SUFFIX@ \
-l@PANEL_NAME@@USE_LIB_SUFFIX@ \
- -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+ -lncurses@USE_LIB_SUFFIX@

LIBROOT = ncurses++

@@ -157,8 +157,7 @@
LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@)

# flags for library built by this makefile
-LDFLAGS = $(TEST_ARGS) @LDFLAGS@ \
- @LD_MODEL@ $(TEST_LIBS) @LIBS@ $(CXXLIBS)
+LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ $(CXXLIBS)

AUTO_SRC = \
etip.h
diff -ruN a/form/Makefile.in b/form/Makefile.in
--- a/form/Makefile.in 2021-07-03 17:45:33.000000000 +0200
+++ b/form/Makefile.in 2021-11-03 10:58:45.301114373 +0100
@@ -110,7 +110,7 @@
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@

SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@

RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
diff -ruN a/menu/Makefile.in b/menu/Makefile.in
--- a/menu/Makefile.in 2021-07-03 17:45:33.000000000 +0200
+++ b/menu/Makefile.in 2021-11-03 10:58:59.461160284 +0100
@@ -110,7 +110,7 @@
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@

SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@

RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
diff -ruN a/panel/Makefile.in b/panel/Makefile.in
--- a/panel/Makefile.in 2021-07-03 17:45:33.000000000 +0200
+++ b/panel/Makefile.in 2021-11-03 10:59:33.957938691 +0100
@@ -112,7 +112,7 @@
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@

SHLIB_DIRS = -L../lib
-SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@
+SHLIB_LIST = $(SHLIB_DIRS) -lncurses@USE_LIB_SUFFIX@

RPATH_LIST = @RPATH_LIST@
RESULTING_SYMS = @RESULTING_SYMS@
Loading