OpenSDE
/
rocklinux
mirror of https://github.com/amery/rocklinux.git
2
0
Fork 0
Code Releases Wiki Activity
mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5284 Commits
1 Branch
0 Tags
34 MiB
Tree: 95973b70a2
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '95973b70a2'
${ noResults }
rocklinux/package/base/net-snmp/head-tail.patch

154 lines
6.4 KiB
Raw Normal View History

Clifford Wolf: massive copyright note update git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5477 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
Stefan Fiedler: net-snmp: fix head-tail issue Index: package/base/net-snmp/head-tail.patch =================================================================== [2004110516055011488] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4822 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
20 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/base/net-snmp/head-tail.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  20. diff -dur net-snmp-5.1/aclocal.m4 net-snmp-5.1-p/aclocal.m4
  21. --- net-snmp-5.1/aclocal.m4 2003-02-13 17:01:23.000000000 +0100
  22. +++ net-snmp-5.1-p/aclocal.m4 2004-11-04 19:36:53.223558384 +0100
  23. @@ -39,7 +39,7 @@
  24. dnl
  25. AC_DEFUN([AC_PROMPT_USER],
  26. [
  27. -MSG_CHECK=`echo "$2" | tail -1`
  28. +MSG_CHECK=`echo "$2" | tail -n1`
  29. AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
  30. [echo "" >&AC_FD_MSG
  31. AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
  32. @@ -3545,7 +3545,7 @@
  33. lt_cv_file_magic_cmd='/usr/bin/file -L'
  34. case "$host_os" in
  35. rhapsody* | darwin1.[[012]])
  36. - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
  37. + lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1`
  38. ;;
  39. *) # Darwin 1.3 on
  40. lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
  41. diff -dur net-snmp-5.1/configure net-snmp-5.1-p/configure
  42. --- net-snmp-5.1/configure 2003-11-14 03:56:34.000000000 +0100
  43. +++ net-snmp-5.1-p/configure 2004-11-04 19:36:41.327366880 +0100
  44. @@ -4106,7 +4106,7 @@
  45. lt_cv_file_magic_cmd='/usr/bin/file -L'
  46. case "$host_os" in
  47. rhapsody* | darwin1.[012])
  48. - lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
  49. + lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n1`
  50. ;;
  51. *) # Darwin 1.3 on
  52. lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
  53. @@ -25980,7 +25980,7 @@
  55. ME=`$WHOAMI`
  56. if test -f /etc/resolv.conf; then
  57. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  58. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  59. else
  60. LOC="@no.where"
  61. fi
  62. @@ -26006,7 +26006,7 @@
  63. Providing the --with-default-snmp-version=\"x\" parameter to ./configure
  64. will avoid this prompt.
  66. -Default version of SNMP to use" | tail -1`
  67. +Default version of SNMP to use" | tail -n1`
  68. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  69. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  70. if test "${ac_cv_user_prompt_DEFAULT_SNMP_VERSION+set}" = set; then
  71. @@ -26087,7 +26087,7 @@
  72. Providing the --with-sys-contact=\"contact\" parameter to ./configure
  73. will avoid this prompt.
  75. -System Contact Information" | tail -1`
  76. +System Contact Information" | tail -n1`
  77. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  78. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  79. if test "${ac_cv_user_prompt_SYS_CONTACT+set}" = set; then
  80. @@ -26151,7 +26151,7 @@
  81. Providing the --with-sys-location=\"location\" parameter to ./configure
  82. will avoid this prompt.
  84. -System Location" | tail -1`
  85. +System Location" | tail -n1`
  86. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  87. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  88. if test "${ac_cv_user_prompt_SYS_LOC+set}" = set; then
  89. @@ -26221,7 +26221,7 @@
  90. Providing the --with-logfile=\"path\" parameter to ./configure
  91. will avoid this prompt.
  93. -Location to write logfile" | tail -1`
  94. +Location to write logfile" | tail -n1`
  95. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  96. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  97. if test "${ac_cv_user_prompt_LOGFILE+set}" = set; then
  98. @@ -26298,7 +26298,7 @@
  99. Providing the --with-persistent-directory=\"path\" parameter to
  100. ./configure will avoid this prompt.
  102. -Location to write persistent information" | tail -1`
  103. +Location to write persistent information" | tail -n1`
  104. echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
  105. echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
  106. if test "${ac_cv_user_prompt_PERSISTENT_DIRECTORY+set}" = set; then
  107. diff -dur net-snmp-5.1/configure.in net-snmp-5.1-p/configure.in
  108. --- net-snmp-5.1/configure.in 2003-11-06 03:11:41.000000000 +0100
  109. +++ net-snmp-5.1-p/configure.in 2004-11-04 19:36:11.392917608 +0100
  110. @@ -2663,7 +2663,7 @@
  112. ME=`$WHOAMI`
  113. if test -f /etc/resolv.conf; then
  114. - LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
  115. + LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n1 | awk '{print $NF}'`
  116. else
  117. LOC="@no.where"
  118. fi
  119. diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV
  120. --- net-snmp-5.1/dist/net-snmp-solaris-build/DEVENV 2003-03-01 05:02:18.000000000 +0100
  121. +++ net-snmp-5.1-p/dist/net-snmp-solaris-build/DEVENV 2004-11-04 19:36:03.998041800 +0100
  122. @@ -48,7 +48,7 @@
  124. umask 022
  126. -user=`ps -f | tail -1 | awk '{print $1}' | sed -e 's, ,,g'`
  127. +user=`ps -f | tail -n1 | awk '{print $1}' | sed -e 's, ,,g'`
  128. [ "$user" = "root" ] && p="#" || p="$"
  130. PS1="`basename $TOP`@"'$HOSTNAME:${PWD##$TOP}$p '; export PS1
  131. diff -dur net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh
  132. --- net-snmp-5.1/dist/net-snmp-solaris-build/elfdepend.sh 2003-03-01 05:02:18.000000000 +0100
  133. +++ net-snmp-5.1-p/dist/net-snmp-solaris-build/elfdepend.sh 2004-11-04 19:35:22.221392816 +0100
  134. @@ -56,7 +56,7 @@
  135. done | sort -u | while read libpath other
  136. do
  137. [ "$libpath" = "#" ] && echo "$libpath $other" && continue # error message
  138. - set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -1`
  139. + set -- `grep "^$libpath[ =]" /var/sadm/install/contents | head -n1`
  140. path=$1; type=$2
  141. case $type in
  142. f) # file
  143. diff -dur net-snmp-5.1/local/snmp-ucd.sh net-snmp-5.1-p/local/snmp-ucd.sh
  144. --- net-snmp-5.1/local/snmp-ucd.sh 2002-04-20 09:30:13.000000000 +0200
  145. +++ net-snmp-5.1-p/local/snmp-ucd.sh 2004-11-04 19:35:15.864359232 +0100
  146. @@ -106,7 +106,7 @@
  147. # Try looking for a /var/run file.
  148. #
  149. [ -f /var/run/$1.pid ] && {
  150. - pid=`head -1 /var/run/$1.pid`
  151. + pid=`head -n1 /var/run/$1.pid`
  153. [ -n "$pid" ] && {
  154. echo $pid