summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/strace/Makefile2
-rw-r--r--package/strace/patches/patch-defs_h12
-rw-r--r--package/strace/patches/patch-defs_h.orig14
-rw-r--r--package/strace/patches/patch-process_c23
-rw-r--r--target/packages/pkg-available/desktop37
-rw-r--r--target/packages/pkg-available/laptop39
-rw-r--r--target/packages/pkg-available/mpdbox1
-rw-r--r--target/packages/pkg-available/vpn-client18
-rw-r--r--target/packages/pkg-available/vpn-server27
9 files changed, 30 insertions, 143 deletions
diff --git a/package/strace/Makefile b/package/strace/Makefile
index a09877355..b2a8ab701 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= strace
PKG_VERSION:= 4.8
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= c575ef43829586801f514fd91bfe7575
PKG_DESCR:= System call trace program
PKG_SECTION:= debug
diff --git a/package/strace/patches/patch-defs_h b/package/strace/patches/patch-defs_h
index 50d061348..5f0cd1732 100644
--- a/package/strace/patches/patch-defs_h
+++ b/package/strace/patches/patch-defs_h
@@ -1,6 +1,14 @@
--- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h 2013-08-14 08:51:03.000000000 +0200
-@@ -162,7 +162,7 @@ extern char *stpcpy(char *dst, const cha
++++ strace-4.8/defs.h 2013-10-24 18:52:25.000000000 +0200
+@@ -155,14 +155,14 @@ extern char *stpcpy(char *dst, const cha
+ || defined(METAG) \
+ || defined(TILE) \
+ || defined(XTENSA) \
+- ) && defined(__GLIBC__)
++ ) && defined(__linux__)
+ # include <sys/ptrace.h>
+ #else
+ /* Work around awkward prototype in ptrace.h. */
# define ptrace xptrace
# include <sys/ptrace.h>
# undef ptrace
diff --git a/package/strace/patches/patch-defs_h.orig b/package/strace/patches/patch-defs_h.orig
deleted file mode 100644
index 60ca6e97a..000000000
--- a/package/strace/patches/patch-defs_h.orig
+++ /dev/null
@@ -1,14 +0,0 @@
---- strace-4.8.orig/defs.h 2013-05-14 16:10:42.000000000 +0200
-+++ strace-4.8/defs.h 2013-08-14 08:01:46.000000000 +0200
-@@ -222,11 +222,6 @@ extern long ptrace(int, int, char *, lon
- # define PTRACE_EVENT_EXIT 6
- #endif
-
--#if !defined(__GLIBC__)
--# define PTRACE_PEEKUSER PTRACE_PEEKUSR
--# define PTRACE_POKEUSER PTRACE_POKEUSR
--#endif
--
- #if USE_SEIZE
- # undef PTRACE_SEIZE
- # define PTRACE_SEIZE 0x4206
diff --git a/package/strace/patches/patch-process_c b/package/strace/patches/patch-process_c
index 7fa9541f1..133b42525 100644
--- a/package/strace/patches/patch-process_c
+++ b/package/strace/patches/patch-process_c
@@ -1,6 +1,21 @@
--- strace-4.8.orig/process.c 2013-05-18 00:22:19.000000000 +0200
-+++ strace-4.8/process.c 2013-08-14 08:47:15.000000000 +0200
-@@ -2857,7 +2857,7 @@ sys_sched_setscheduler(struct tcb *tcp)
++++ strace-4.8/process.c 2013-10-24 18:57:55.000000000 +0200
+@@ -56,14 +56,12 @@
+ #endif
+
+ #ifdef HAVE_LINUX_PTRACE_H
+-# undef PTRACE_SYSCALL
+ # ifdef HAVE_STRUCT_IA64_FPREG
+ # define ia64_fpreg XXX_ia64_fpreg
+ # endif
+ # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
+ # define pt_all_user_regs XXX_pt_all_user_regs
+ # endif
+-# include <linux/ptrace.h>
+ # undef ia64_fpreg
+ # undef pt_all_user_regs
+ #endif
+@@ -2857,7 +2855,7 @@ sys_sched_setscheduler(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[2], &p) < 0)
tprintf(", %#lx", tcp->u_arg[2]);
else
@@ -9,7 +24,7 @@
}
return 0;
}
-@@ -2872,7 +2872,7 @@ sys_sched_getparam(struct tcb *tcp)
+@@ -2872,7 +2870,7 @@ sys_sched_getparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%#lx", tcp->u_arg[1]);
else
@@ -18,7 +33,7 @@
}
return 0;
}
-@@ -2885,7 +2885,7 @@ sys_sched_setparam(struct tcb *tcp)
+@@ -2885,7 +2883,7 @@ sys_sched_setparam(struct tcb *tcp)
if (umove(tcp, tcp->u_arg[1], &p) < 0)
tprintf("%d, %#lx", (int) tcp->u_arg[0], tcp->u_arg[1]);
else
diff --git a/target/packages/pkg-available/desktop b/target/packages/pkg-available/desktop
deleted file mode 100644
index de2e85381..000000000
--- a/target/packages/pkg-available/desktop
+++ /dev/null
@@ -1,37 +0,0 @@
-config ADK_PKG_DESKTOP
- bool "Choose packages for my desktop system with X"
- default n
- select ADK_PACKAGE_SCREEN
- select ADK_PACKAGE_VIM
- select ADK_PACKAGE_SUDO
- select ADK_PACKAGE_LYNX
- select ADK_PACKAGE_KEYCHAIN
- select ADK_PACKAGE_ALSA_UTILS
- select ADK_PACKAGE_OPENSSH_CLIENT
- select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
- select ADK_PACKAGE_OPENSSH_SERVER
- select ADK_PACKAGE_MKSH
- select ADK_PACKAGE_MKSH_FULL
- select ADK_PACKAGE_RXVT_UNICODE
- select ADK_PACKAGE_XTERM
- select ADK_PACKAGE_XORG_SERVER
- select ADK_PACKAGE_XORG_SERVER_WITH_DRI
- select ADK_PACKAGE_XF86_INPUT_KEYBOARD
- select ADK_PACKAGE_XF86_INPUT_MOUSE
- select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_TAROX_PC
- select ADK_PACKAGE_FONT_MISC_MISC
- select ADK_PACKAGE_SETXKBMAP
- select ADK_PACKAGE_XBINDKEYS
- select ADK_PACKAGE_DISPLAY
- select ADK_PACKAGE_FEH
- select ADK_PACKAGE_XINIT
- select ADK_PACKAGE_EVILWM
- select ADK_PACKAGE_IRSSI
- select ADK_PACKAGE_IRSSI_WITH_SSL
- select ADK_PACKAGE_IRSSI_WITH_IPV6
- select ADK_PACKAGE_XRDB
- select ADK_PACKAGE_FIREFOX
- select ADK_PACKAGE_DILLO
- select ADK_PACKAGE_MPLAYER
- select ADK_KPACKAGE_KMOD_USB_STORAGE
- select ADK_KPACKAGE_KMOD_USB_HID
diff --git a/target/packages/pkg-available/laptop b/target/packages/pkg-available/laptop
deleted file mode 100644
index 4810a71fc..000000000
--- a/target/packages/pkg-available/laptop
+++ /dev/null
@@ -1,39 +0,0 @@
-config ADK_PKG_LAPTOP
- bool "Choose packages for my laptop system with X"
- default n
- select ADK_PACKAGE_SCREEN
- select ADK_PACKAGE_VIM
- select ADK_PACKAGE_SUDO
- select ADK_PACKAGE_LYNX
- select ADK_PACKAGE_KEYCHAIN
- select ADK_PACKAGE_ALSA_UTILS
- select ADK_PACKAGE_OPENSSH_CLIENT
- select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
- select ADK_PACKAGE_OPENSSH_SERVER
- select ADK_PACKAGE_MKSH
- select ADK_PACKAGE_MKSH_FULL
- select ADK_PACKAGE_RXVT_UNICODE
- select ADK_PACKAGE_XTERM
- select ADK_PACKAGE_XORG_SERVER
- select ADK_PACKAGE_XORG_SERVER_WITH_DRI
- select ADK_PACKAGE_XF86_INPUT_KEYBOARD
- select ADK_PACKAGE_XF86_INPUT_MOUSE
- select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40
- select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
- select ADK_PACKAGE_FONT_MISC_MISC
- select ADK_PACKAGE_SETXKBMAP
- select ADK_PACKAGE_XBINDKEYS
- select ADK_PACKAGE_DISPLAY
- select ADK_PACKAGE_FEH
- select ADK_PACKAGE_XINIT
- select ADK_PACKAGE_EVILWM
- select ADK_PACKAGE_IRSSI
- select ADK_PACKAGE_IRSSI_WITH_SSL
- select ADK_PACKAGE_IRSSI_WITH_IPV6
- select ADK_PACKAGE_XRDB
- select ADK_PACKAGE_DILLO
- select ADK_PACKAGE_MPLAYER
- select ADK_PACKAGE_MPC
- select ADK_PACKAGE_WPA_SUPPLICANT
- select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
- select ADK_KPACKAGE_KMOD_USB_STORAGE
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index cedb79b04..d3e73cb6b 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -1,7 +1,6 @@
config ADK_PKG_MPDBOX
bool "Choose packages for MPDBox system"
default n
- select BUSYBOX_NTPD
select ADK_PACKAGE_LIBMPDCLIENT
select ADK_PACKAGE_MPC
select ADK_PACKAGE_MPD
diff --git a/target/packages/pkg-available/vpn-client b/target/packages/pkg-available/vpn-client
deleted file mode 100644
index 9075eeaa8..000000000
--- a/target/packages/pkg-available/vpn-client
+++ /dev/null
@@ -1,18 +0,0 @@
-config ADK_PKG_VPN_CLIENT
- bool "Compile a OpenVPN client system"
- default n
- select ADK_PACKAGE_OPENVPN
- select ADK_PACKAGE_OPENVPN_WITH_LZO
- select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT
- select ADK_PACKAGE_OPENVPN_CLIENT
- select ADK_PACKAGE_OPENNTPD
- select ADK_PACKAGE_IPTABLES
- select ADK_PACKAGE_PPP
- select ADK_PACKAGE_PPP_MOD_PPPOE
- # optional
- select ADK_PACKAGE_VIM
- select ADK_PACKAGE_SCREEN
- select ADK_PACKAGE_STRACE
- select ADK_PACKAGE_TCPDUMP
- help
- VPN Client system with OpenVPN.
diff --git a/target/packages/pkg-available/vpn-server b/target/packages/pkg-available/vpn-server
deleted file mode 100644
index 2057a0a45..000000000
--- a/target/packages/pkg-available/vpn-server
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PKG_VPN_SERVER
- bool "Compile a OpenVPN server system"
- default n
- select ADK_PACKAGE_OPENVPN
- select ADK_PACKAGE_OPENVPN_EASY_RSA
- select ADK_PACKAGE_OPENVPN_WITH_LZO
- select ADK_PACKAGE_OPENVPN_WITH_MANAGEMENT
- select ADK_PACKAGE_OPENVPN_SERVER
- select ADK_PACKAGE_OPENNTPD
- select ADK_PACKAGE_IPTABLES
- select ADK_PACKAGE_ICINGA
- select ADK_PACKAGE_NAGIOS_PLUGINS
- select ADK_PACKAGE_POSTFIX
- select ADK_PACKAGE_MAILUTILS
- select ADK_PACKAGE_PHP
- select ADK_PACKAGE_PHP_FASTCGI
- select ADK_PACKAGE_LIGHTTPD
- select ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
- select ADK_PACKAGE_PPP
- select ADK_PACKAGE_PPP_MOD_PPPOE
- # optional
- select ADK_PACKAGE_VIM
- select ADK_PACKAGE_SCREEN
- select ADK_PACKAGE_STRACE
- select ADK_PACKAGE_TCPDUMP
- help
- VPN Server system with OpenVPN.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 18:17:13 +0000