|
Lines 26-37
Link Here
|
| 26 |
MV=/bin/mv |
26 |
MV=/bin/mv |
| 27 |
RM=/bin/rm |
27 |
RM=/bin/rm |
| 28 |
case $(${UNAME}) in |
28 |
case $(${UNAME}) in |
| 29 |
FreeBSD) |
|
|
| 30 |
UMASK=/usr/bin/umask |
| 31 |
OPENSSL=/usr/bin/openssl |
| 32 |
CHOWN=/usr/sbin/chown |
| 33 |
NC=/usr/bin/nc |
| 34 |
;; |
| 35 |
OpenBSD) |
29 |
OpenBSD) |
| 36 |
UMASK=/usr/bin/umask |
30 |
UMASK=/usr/bin/umask |
| 37 |
OPENSSL=/usr/sbin/openssl |
31 |
OPENSSL=/usr/sbin/openssl |
|
Lines 38-49
Link Here
|
| 38 |
CHOWN=/sbin/chown |
32 |
CHOWN=/sbin/chown |
| 39 |
NC=/usr/bin/nc |
33 |
NC=/usr/bin/nc |
| 40 |
;; |
34 |
;; |
| 41 |
DragonFly) |
|
|
| 42 |
UMASK=/usr/bin/umask |
| 43 |
OPENSSL=/usr/bin/openssl |
| 44 |
CHOWN=/usr/sbin/chown |
| 45 |
NC=/usr/local/bin/netcat |
| 46 |
;; |
| 47 |
NetBSD) |
35 |
NetBSD) |
| 48 |
UMASK=umask |
36 |
UMASK=umask |
| 49 |
OPENSSL=/usr/bin/openssl |
37 |
OPENSSL=/usr/bin/openssl |
|
Lines 351-366
Link Here
|
| 351 |
|
339 |
|
| 352 |
report_devices() { |
340 |
report_devices() { |
| 353 |
case $(${UNAME}) in |
341 |
case $(${UNAME}) in |
| 354 |
FreeBSD|DragonFly) |
342 |
FreeBSD|DragonFly|MidnightBSD) |
| 355 |
local query_string="" |
343 |
local query_string="" |
| 356 |
local line |
344 |
local line |
| 357 |
for line in $(${PCICONF} -l); do |
345 |
while read line |
|
|
346 |
do |
| 358 |
local DRIVER=$(echo "${line}" | ${AWK} -F\@ '{print $1}') |
347 |
local DRIVER=$(echo "${line}" | ${AWK} -F\@ '{print $1}') |
| 359 |
local DEV=$(echo "${line}" | ${AWK} '{print $4}' | ${CUT} -c8-15) |
348 |
if [ "0`echo "${line}" | awk '{print $5}' | awk -F= '{print $1}'`" = "0vendor" ]; then |
|
|
349 |
local VENDOR=$(echo "${line}" | ${AWK} '{print $5}' | ${CUT} -c10-15) |
| 350 |
local DEVICE=$(echo "${line}" | ${AWK} '{print $6}' | ${CUT} -c10-15) |
| 351 |
local DEV=$(echo "${DEVICE}${VENDOR}") |
| 352 |
else |
| 353 |
local DEV=$(echo "${line}" | ${AWK} '{print $4}' | ${CUT} -c8-15) |
| 354 |
fi |
| 360 |
local CLASS=$(echo "${line}" | ${AWK} '{print $2}' | ${CUT} -c9-14) |
355 |
local CLASS=$(echo "${line}" | ${AWK} '{print $2}' | ${CUT} -c9-14) |
| 361 |
query_string=$query_string`echo \&dev[]=${DRIVER}:${DEV}:${CLASS}` |
356 |
query_string=$query_string`echo \&dev[]=${DRIVER}:${DEV}:${CLASS}` |
| 362 |
done |
357 |
done << EOT |
| 363 |
|
358 |
$(${PCICONF} -l) |
|
|
359 |
EOT |
| 364 |
echo_begin "Posting device statistics to ${checkin_server_description}" |
360 |
echo_begin "Posting device statistics to ${checkin_server_description}" |
| 365 |
do_http_request_check_status "GET" "/scripts/report_devices.php?token=${TOKEN}&key=${KEY}$query_string" \ |
361 |
do_http_request_check_status "GET" "/scripts/report_devices.php?token=${TOKEN}&key=${KEY}$query_string" \ |
| 366 |
"" "" "system devices submission" |
362 |
"" "" "system devices submission" |
|
Lines 373-386
Link Here
|
| 373 |
esac |
369 |
esac |
| 374 |
} |
370 |
} |
| 375 |
|
371 |
|
|
|
372 |
get_mports() { |
| 373 |
for i in `/usr/libexec/mport.list | xargs` |
| 374 |
do |
| 375 |
pkg=$(echo "select pkg from packages where pkg || '-' || version = '$i'" | sqlite3 /var/db/mport/master.db) |
| 376 |
echo -n "$i " |
| 377 |
mport info $pkg | grep Origin | awk '{print $3}' |
| 378 |
done |
| 379 |
} |
| 380 |
|
| 376 |
report_ports() { |
381 |
report_ports() { |
| 377 |
case $(${UNAME}) in |
382 |
case $(${UNAME}) in |
| 378 |
FreeBSD|DragonFly) |
383 |
FreeBSD|DragonFly|MidnightBSD) |
| 379 |
local query_string="" |
384 |
local query_string="" |
| 380 |
# Detect pkgng |
385 |
# Detect pkgng |
| 381 |
if [ -e /var/db/pkg/local.sqlite ]; then |
386 |
if [ -e /var/db/pkg/local.sqlite ]; then |
| 382 |
# Use pkgng |
387 |
# Use pkgng |
| 383 |
query_string="${query_string}$(pkg info -o "*" | ${SED} -E -e 's/\+/%2b/g' -e 's/,/%2c/g' -e 's/^([^ ]+) +([^\/]+)\/.+$/\&port[]=\2:\1/g' | tr -d '\n')" |
388 |
case $(${UNAME}) in |
|
|
389 |
MidnightBSD) |
| 390 |
query_string="${query_string}$( get_mports | ${SED} -E -e 's/\+/%2b/g' -e 's/,/%2c/g' -e 's/^([^ ]+) +([^\/]+)\/.+$/\&port[]=\2:\1/g' | tr -d '\n')" |
| 391 |
;; |
| 392 |
*) |
| 393 |
query_string="${query_string}$( pkg info -o "*" | ${SED} -E -e 's/\+/%2b/g' -e 's/,/%2c/g' -e 's/^([^ ]+) +([^\/]+)\/.+$/\&port[]=\2:\1/g' | tr -d '\n')" |
| 394 |
;; |
| 395 |
esac |
| 384 |
else |
396 |
else |
| 385 |
#-----BEGIN LEGACY: to delete when FreeBSD with pkg_ tools is out of support period (!!! don't forget to clarify what does DragonFly use before removing !!!) ----- |
397 |
#-----BEGIN LEGACY: to delete when FreeBSD with pkg_ tools is out of support period (!!! don't forget to clarify what does DragonFly use before removing !!!) ----- |
| 386 |
# Use obsolete pkg_* tools |
398 |
# Use obsolete pkg_* tools |