Merge branch '3.5' into 3.6

This commit is contained in:
Fredrik Rinnestam 2020-10-14 19:47:46 +02:00
commit 026bb5186e
6 changed files with 11 additions and 132 deletions

View File

@ -1,99 +0,0 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/dstat
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/dstat/
-rwxr-xr-x root/root usr/share/dstat/dstat.py
-rw-r--r-- root/root usr/share/dstat/dstat_battery.py
-rw-r--r-- root/root usr/share/dstat/dstat_battery_remain.py
-rw-r--r-- root/root usr/share/dstat/dstat_condor_queue.py
-rw-r--r-- root/root usr/share/dstat/dstat_cpufreq.py
-rw-r--r-- root/root usr/share/dstat/dstat_dbus.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_avgqu.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_avgrq.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_svctm.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_tps.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_util.py
-rw-r--r-- root/root usr/share/dstat/dstat_disk_wait.py
-rw-r--r-- root/root usr/share/dstat/dstat_dstat.py
-rw-r--r-- root/root usr/share/dstat/dstat_dstat_cpu.py
-rw-r--r-- root/root usr/share/dstat/dstat_dstat_ctxt.py
-rw-r--r-- root/root usr/share/dstat/dstat_dstat_mem.py
-rw-r--r-- root/root usr/share/dstat/dstat_fan.py
-rw-r--r-- root/root usr/share/dstat/dstat_freespace.py
-rw-r--r-- root/root usr/share/dstat/dstat_fuse.py
-rw-r--r-- root/root usr/share/dstat/dstat_gpfs.py
-rw-r--r-- root/root usr/share/dstat/dstat_gpfs_ops.py
-rw-r--r-- root/root usr/share/dstat/dstat_helloworld.py
-rw-r--r-- root/root usr/share/dstat/dstat_innodb_buffer.py
-rw-r--r-- root/root usr/share/dstat/dstat_innodb_io.py
-rw-r--r-- root/root usr/share/dstat/dstat_innodb_ops.py
-rw-r--r-- root/root usr/share/dstat/dstat_lustre.py
-rw-r--r-- root/root usr/share/dstat/dstat_md_status.py
-rw-r--r-- root/root usr/share/dstat/dstat_memcache_hits.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_cmds.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_conn.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_innodb.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_innodb_basic.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_innodb_extra.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_io.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql5_keys.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql_io.py
-rw-r--r-- root/root usr/share/dstat/dstat_mysql_keys.py
-rw-r--r-- root/root usr/share/dstat/dstat_net_packets.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfs3.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfs3_ops.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfsd3.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfsd3_ops.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfsd4_ops.py
-rw-r--r-- root/root usr/share/dstat/dstat_nfsstat4.py
-rw-r--r-- root/root usr/share/dstat/dstat_ntp.py
-rw-r--r-- root/root usr/share/dstat/dstat_postfix.py
-rw-r--r-- root/root usr/share/dstat/dstat_power.py
-rw-r--r-- root/root usr/share/dstat/dstat_proc_count.py
-rw-r--r-- root/root usr/share/dstat/dstat_qmail.py
-rw-r--r-- root/root usr/share/dstat/dstat_redis.py
-rw-r--r-- root/root usr/share/dstat/dstat_rpc.py
-rw-r--r-- root/root usr/share/dstat/dstat_rpcd.py
-rw-r--r-- root/root usr/share/dstat/dstat_sendmail.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_cpu.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_load.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_mem.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_net.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_net_err.py
-rw-r--r-- root/root usr/share/dstat/dstat_snmp_sys.py
-rw-r--r-- root/root usr/share/dstat/dstat_snooze.py
-rw-r--r-- root/root usr/share/dstat/dstat_squid.py
-rw-r--r-- root/root usr/share/dstat/dstat_test.py
-rw-r--r-- root/root usr/share/dstat/dstat_thermal.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_bio.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_bio_adv.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_childwait.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_cpu.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_cpu_adv.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_cputime.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_cputime_avg.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_int.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_io.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_io_adv.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_latency.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_latency_avg.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_mem.py
-rw-r--r-- root/root usr/share/dstat/dstat_top_oom.py
-rw-r--r-- root/root usr/share/dstat/dstat_utmp.py
-rw-r--r-- root/root usr/share/dstat/dstat_vm_cpu.py
-rw-r--r-- root/root usr/share/dstat/dstat_vm_mem.py
-rw-r--r-- root/root usr/share/dstat/dstat_vm_mem_adv.py
-rw-r--r-- root/root usr/share/dstat/dstat_vmk_hba.py
-rw-r--r-- root/root usr/share/dstat/dstat_vmk_int.py
-rw-r--r-- root/root usr/share/dstat/dstat_vmk_nic.py
-rw-r--r-- root/root usr/share/dstat/dstat_vz_cpu.py
-rw-r--r-- root/root usr/share/dstat/dstat_vz_io.py
-rw-r--r-- root/root usr/share/dstat/dstat_vz_ubc.py
-rw-r--r-- root/root usr/share/dstat/dstat_wifi.py
-rw-r--r-- root/root usr/share/dstat/dstat_zfs_arc.py
-rw-r--r-- root/root usr/share/dstat/dstat_zfs_l2arc.py
-rw-r--r-- root/root usr/share/dstat/dstat_zfs_zil.py
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/dstat.1.gz

View File

@ -1,5 +0,0 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF39NT8lVr2PYQOiN9uBVxNCIgT0k2iYTFh0loPaPXuGag2sNo5stFjnCQjXHwdkUhfObIJIBrVmN5StxhXBYSCAM=
SHA256 (Pkgfile) = f9204ea7eda4a607d0b22b7293ac12020586c9765cee81cecdef0f37c202e271
SHA256 (.footprint) = b8ba39abde2395dc054850cc37ca21db3f0bccda42efeda2272732ad05b04dcd
SHA256 (dstat-0.7.3.tar.gz) = 46e63821857b69fbc60cb2c7d893ccdd6f31cd9ef24b8bb0b68951e1c7374898

View File

@ -1,15 +0,0 @@
# Description: Versatile resource statistics tool
# URL: http://dag.wieers.com/home-made/dstat/
# Maintainer: Fredrik Rinnestam, fredrik at rinnestam dot se
# Depends on: python
name=dstat
version=0.7.3
release=1
source=(https://crux.nu/~fredrik/distfiles/$name-$version.tar.gz)
build() {
cd $name-$version
make
make DESTDIR=$PKG install
}

View File

@ -141,10 +141,10 @@ drwxr-xr-x root/root usr/include/libnm/
-rw-r--r-- root/root usr/include/libnm/nm-wimax-nsp.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/NetworkManager/
drwxr-xr-x root/root usr/lib/NetworkManager/1.26.2/
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.2/libnm-device-plugin-adsl.so
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.2/libnm-device-plugin-wifi.so
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.2/libnm-settings-plugin-ifupdown.so
drwxr-xr-x root/root usr/lib/NetworkManager/1.26.4/
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.4/libnm-device-plugin-adsl.so
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.4/libnm-device-plugin-wifi.so
-rwxr-xr-x root/root usr/lib/NetworkManager/1.26.4/libnm-settings-plugin-ifupdown.so
drwxr-xr-x root/root usr/lib/NetworkManager/VPN/
drwxr-xr-x root/root usr/lib/NetworkManager/conf.d/
drwxr-xr-x root/root usr/lib/NetworkManager/dispatcher.d/

View File

@ -1,11 +1,10 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF39LLh4sgERun9B40lEcK9Gdpx4dZtjj3gL9smhnmI6upT+SOLTnv5OT5iJyARa2SVTMpl63qBsLeEUediYtCTgY=
SHA256 (Pkgfile) = 6b0e0bbcef5eafdc243bbce882d553d710102549792dc62c6256baaa288b11c4
SHA256 (.footprint) = b08926af77d636a60f30b82e6aa40613a200d236dae85e88a97d2b5c61446fa0
SHA256 (NetworkManager-1.26.2.tar.xz) = 2a8368ed1e4485e2ba7ca83b4b2bb07cacc33562951eb77de10d2b6411dce7e6
RWSagIOpLGJF3xj4z0jQIKPMtA3Tq5khbnhLPw5PCeFED52ncH3jV3TRt5rAt1I0Rcg2+DgHa5RiU1E8QGlp/cvtz78jP9o1dgY=
SHA256 (Pkgfile) = fa30044217c0feed55085e11352b272e6ab450a488ff9550e571ebc8cd0eae70
SHA256 (.footprint) = bdf72209d0a425869e9799f1256bce336431c3a7df821741759708fd0326865f
SHA256 (NetworkManager-1.26.4.tar.xz) = 7995802c67e54fc58be4c0e3d2095d943f53f4300a93bde7ff48822a0b1f62ea
SHA256 (networkmanager.rc) = dc0b743685214c0402d392a6a9b2632b19714795a04c0f42ba10026250d9f3fc
SHA256 (NetworkManager.conf) = 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
SHA256 (polkit.conf) = 7410be567871e4dc8ef1e8204f80b7cfd0dd08abfa514408b7d549bdc70dbaba
SHA256 (dhcp.conf) = cd2a4b0079c0726973c1cf226c4e1cb4f2d27d02c16e0e08af7e4d6b8770423c
SHA256 (org.freedesktop.NetworkManager.rules) = 7708da5de800684eb7036f29534ac6f3004115695428484e09b712da5bb1e8a5
SHA256 (docs.patch) = f8471a5965faf204602b8062b68a7623d8736c6b7e9016a0fab218099d44d3b2

View File

@ -5,16 +5,15 @@
# Optional: ppp avahi bash-completion dbus libnl jansson libteam dnsmasq
name=networkmanager
version=1.26.2
release=2
version=1.26.4
release=1
source=(https://download.gnome.org/sources/NetworkManager/${version::4}/NetworkManager-$version.tar.xz
networkmanager.rc NetworkManager.conf polkit.conf dhcp.conf
org.freedesktop.NetworkManager.rules docs.patch)
org.freedesktop.NetworkManager.rules)
build() {
sed '/initrd/d' -i NetworkManager-$version/src/meson.build
patch -Np1 -d NetworkManager-$version -i $SRC/docs.patch
CXXFLAGS+="-O2 -fPIC" \
meson NetworkManager-$version build \
--prefix /usr \