diff options
| author | Juergen Daubert <jue@jue.li> | 2019-04-09 14:37:44 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2019-04-09 14:37:44 +0200 |
| commit | 8a06b1a18cfb99e4995b4d9fd00800a36707962f (patch) | |
| tree | 3f194f7cf876f6eac53c7a15739f454cdbf76705 /cifs-utils | |
| parent | f256aef884a74dbfacf95bbfb86990700c792366 (diff) | |
| parent | 19960e15b8f48e0b58f037073232470ac791d283 (diff) | |
| download | opt-8a06b1a18cfb99e4995b4d9fd00800a36707962f.tar.gz opt-8a06b1a18cfb99e4995b4d9fd00800a36707962f.tar.xz | |
Merge branch '3.4' into 3.5
Conflicts:
python3/.signature
samba/.signature
samba/Pkgfile
Diffstat (limited to 'cifs-utils')
| -rw-r--r-- | cifs-utils/.footprint | 2 | ||||
| -rw-r--r-- | cifs-utils/.signature | 10 | ||||
| -rw-r--r-- | cifs-utils/Pkgfile | 7 | ||||
| -rw-r--r-- | cifs-utils/cifs-utils-man.tar.xz | bin | 15920 -> 17548 bytes |
4 files changed, 10 insertions, 9 deletions
diff --git a/cifs-utils/.footprint b/cifs-utils/.footprint index ebaac74c4..9c30e6b61 100644 --- a/cifs-utils/.footprint +++ b/cifs-utils/.footprint @@ -8,6 +8,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cifscreds -rwxr-xr-x root/root usr/bin/getcifsacl -rwxr-xr-x root/root usr/bin/setcifsacl +-rwxr-xr-x root/root usr/bin/smbinfo drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/cifsidmap.h drwxr-xr-x root/root usr/lib/ @@ -21,6 +22,7 @@ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/cifscreds.1.gz -rw-r--r-- root/root usr/share/man/man1/getcifsacl.1.gz -rw-r--r-- root/root usr/share/man/man1/setcifsacl.1.gz +-rw-r--r-- root/root usr/share/man/man1/smbinfo.1.gz drwxr-xr-x root/root usr/share/man/man8/ -rw-r--r-- root/root usr/share/man/man8/cifs.idmap.8.gz -rw-r--r-- root/root usr/share/man/man8/idmapwb.8.gz diff --git a/cifs-utils/.signature b/cifs-utils/.signature index 85f5e2e45..e8dd33a94 100644 --- a/cifs-utils/.signature +++ b/cifs-utils/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dNy0ksnNaWMXFqyr1yK6CXIpLBXtLx2ziuQGHOdIc9HVvLkHSvzNX0kvCWKfMtKbC9KL5Y9wB/GGgXm2wXU4AE= -SHA256 (Pkgfile) = 2ff1faee2ddcd1103bf9c0544b55e19889e6fac84914a47d4898253ddb353819 -SHA256 (.footprint) = 24d983fca25f91dd80378ea506d7a8a8be8d65c3eb9c1bae1a79fb1ac76023ed -SHA256 (cifs-utils-6.8.tar.bz2) = e7d1f6050c43f21f82cd77e288eb756755effd22f0c310fc2c525df9d41dff79 -SHA256 (cifs-utils-man.tar.xz) = 14b14f323a66f049e23e639c20ae1898f7bdea8ce8de814166bb7d5d60812e5c +RWSE3ohX2g5d/aSh0LPxdO9HP/9d1bTRx/e2+e/eH+3d3aOAQJLZYrU7fosIGKs9x7ozuY0nsEbnVJYhNQfgS8+2IGq/8sMt/w0= +SHA256 (Pkgfile) = b44d08ebdc423c2329493f120230f35a5d1fcc52098bc1b1fb37f3b446693787 +SHA256 (.footprint) = f0590716ad6497a8e9156d8ce2c1fbf39e4b1383bcbd4e1567457cbb928302ba +SHA256 (cifs-utils-6.9.tar.bz2) = 18d8f1bf92c13c4d611502dbd6759e3a766ddc8467ec8a2eda3f589e40b9ac9c +SHA256 (cifs-utils-man.tar.xz) = a3663f891a5606e77371c0aae38cdb353cf5210cbedb64e956c5b9b65d94306b SHA256 (cifs) = 6dc576a4b23722cc9b7fd630275f3ba721a0e659a8a9642cd0f7c37df09c9e79 diff --git a/cifs-utils/Pkgfile b/cifs-utils/Pkgfile index e8bc1ed36..243fce63f 100644 --- a/cifs-utils/Pkgfile +++ b/cifs-utils/Pkgfile @@ -4,7 +4,7 @@ # Depends on: samba keyutils name=cifs-utils -version=6.8 +version=6.9 release=1 source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2 cifs-utils-man.tar.xz cifs) @@ -12,14 +12,13 @@ source=(https://download.samba.org/pub/linux-cifs/$name/$name-$version.tar.bz2 build () { cd $name-$version - autoreconf -i ./configure --prefix=/usr make make DESTDIR=$PKG install install -d $PKG/usr/share/man/man{1,8} - install -m 0644 *.1 $PKG/usr/share/man/man1 - install -m 0644 *.8 $PKG/usr/share/man/man8 + install -m 0644 $SRC/*.1 $PKG/usr/share/man/man1 + install -m 0644 $SRC/*.8 $PKG/usr/share/man/man8 install -D -m 0755 $SRC/cifs $PKG/etc/rc.d/cifs } diff --git a/cifs-utils/cifs-utils-man.tar.xz b/cifs-utils/cifs-utils-man.tar.xz Binary files differindex eb6db5ec1..5f1303a38 100644 --- a/cifs-utils/cifs-utils-man.tar.xz +++ b/cifs-utils/cifs-utils-man.tar.xz |