Waldemar Brodkorb 2 лет назад
Родитель
Сommit
2d1502937c

+ 2 - 2
package/tcsh/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/rules.mk
 
 
 PKG_NAME:=		tcsh
 PKG_NAME:=		tcsh
-PKG_VERSION:=		6.19.00
+PKG_VERSION:=		6.24.10
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_HASH:=		12e271e0b89e4259d9d6e8d525322e77340e7244cfbd199a591e5f8146285c49
+PKG_HASH:=		13475c0fbeb74139d33ed793bf00ffbbb2ac2dc9fb1d44467a410760aba36664
 PKG_DESCR:=		alternative csh
 PKG_DESCR:=		alternative csh
 PKG_SECTION:=		base/shells
 PKG_SECTION:=		base/shells
 PKG_DEPENDS:=		libncurses
 PKG_DEPENDS:=		libncurses

+ 9 - 9
package/tcsh/patches/patch-Makefile_in

@@ -1,11 +1,11 @@
---- tcsh-6.19.00.orig/Makefile.in	2014-07-25 00:52:13.000000000 +0200
-+++ tcsh-6.19.00/Makefile.in	2015-11-07 23:08:07.000000000 +0100
-@@ -449,7 +449,7 @@ pure:$(P) ${OBJS}
+--- tcsh-6.24.10.orig/Makefile.in	2023-04-14 13:52:38.000000000 +0200
++++ tcsh-6.24.10/Makefile.in	2024-02-11 09:31:36.700281877 +0100
+@@ -506,7 +506,7 @@ pure:$(P) ${OBJS}
+ #	emxbind tcsh
  
  
- gethost:  gethost.c sh.err.h tc.const.h sh.h
- 	rm -f gethost
--	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c
-+	${CC_FOR_GETHOST} -o gethost $(srcdir)/gethost.c
+ gethost.${SUF}: gethost.c sh.err.h tc.const.h sh.h
+-	${CC_FOR_GETHOST} ${CF} ${CPPFLAGS} ${CFLAGS} $(srcdir)/gethost.c
++	${CC_FOR_GETHOST} ${CF} $(srcdir)/gethost.c
  
  
- tc.defs.c:	gethost host.defs
- 	@rm -f $@.tmp
+ gethost:  gethost.${SUF}
+ 	rm -f gethost

+ 0 - 23
package/tcsh/patches/patch-sh_h

@@ -1,23 +0,0 @@
---- tcsh-6.19.00.orig/sh.h	2015-05-10 15:29:28.000000000 +0200
-+++ tcsh-6.19.00/sh.h	2015-11-07 23:06:35.000000000 +0100
-@@ -366,7 +366,7 @@ typedef long tcsh_number_t;
- # include <sys/filio.h>
- #endif /* (!FIOCLEX && SUNOS4) || (SYSVREL == 4 && !_SEQUENT_ && !SCO && !_SX ) */
- 
--#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D)
-+#if !defined(_MINIX) && !defined(supermax) && !defined(WINNT_NATIVE) && !defined(IRIS4D) && !defined(__FreeBSD__)
- # include <sys/file.h>
- #endif	/* !_MINIX && !supermax && !WINNT_NATIVE && !defined(IRIS4D) */
- 
-@@ -400,9 +400,11 @@ typedef long tcsh_number_t;
- #include <pwd.h>
- #include <grp.h>
- #endif /* WINNT_NATIVE */
-+#if !defined(BSD)
- #ifdef HAVE_SHADOW_H
- # include <shadow.h>
- #endif /* HAVE_SHADOW_H */
-+#endif
- #ifdef HAVE_AUTH_H
- # include <auth.h>
- #endif /* HAVE_AUTH_H */

+ 0 - 11
package/tcsh/patches/patch-sh_proc_c

@@ -1,11 +0,0 @@
---- tcsh-6.19.00.orig/sh.proc.c	2015-02-22 22:40:14.000000000 +0100
-+++ tcsh-6.19.00/sh.proc.c	2015-11-07 23:06:36.000000000 +0100
-@@ -47,7 +47,7 @@ RCSID("$tcsh: sh.proc.c,v 3.127 2015/02/
- # define HZ 16
- #endif /* aiws */
- 
--#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
-+#if defined(_BSD) || (defined(IRIS4D) && __STDC__) || defined(__lucid) || defined(__GNU__) || defined(__GLIBC__)
- # if !defined(__ANDROID__)
- #  define BSDWAIT
- # endif