mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-12 11:30:49 +00:00
merge master
This commit is contained in:
commit
d7ed2ad861
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install git pbuilder debhelper fakeroot
|
sudo apt-get install git pbuilder debhelper lsb-release fakeroot sudo debian-archive-keyring debian-keyring
|
||||||
```
|
```
|
||||||
|
|
||||||
## Checkout ClickHouse Sources
|
## Checkout ClickHouse Sources
|
||||||
@ -17,7 +17,6 @@ cd ClickHouse
|
|||||||
## Run Release Script
|
## Run Release Script
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
pbuilder create
|
|
||||||
./release
|
./release
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -1,18 +1,30 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
## Fixed in ClickHouse Release 1.1.54388, 2018-06-28
|
## Fixed in ClickHouse Release 1.1.54388, 2018-06-28
|
||||||
|
=======
|
||||||
|
## Fixed in ClickHouse release 1.1.54388, 2018-06-28
|
||||||
|
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
||||||
|
|
||||||
### CVE-2018-14668
|
### CVE-2018-14668
|
||||||
"remote" table function allowed arbitrary symbols in "user", "password" and "default_database" fields which led to Cross Protocol Request Forgery Attacks.
|
"remote" table function allowed arbitrary symbols in "user", "password" and "default_database" fields which led to Cross Protocol Request Forgery Attacks.
|
||||||
|
|
||||||
Credits: Andrey Krasichkov of Yandex Information Security Team
|
Credits: Andrey Krasichkov of Yandex Information Security Team
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
## Fixed in ClickHouse Release 1.1.54390, 2018-07-06
|
## Fixed in ClickHouse Release 1.1.54390, 2018-07-06
|
||||||
|
=======
|
||||||
|
## Fixed in ClickHouse release 1.1.54390, 2018-07-06
|
||||||
|
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
||||||
|
|
||||||
### CVE-2018-14669
|
### CVE-2018-14669
|
||||||
ClickHouse MySQL client had "LOAD DATA LOCAL INFILE" functionality enabled that allowed a malicious MySQL database read arbitrary files from the connected ClickHouse server.
|
ClickHouse MySQL client had "LOAD DATA LOCAL INFILE" functionality enabled that allowed a malicious MySQL database read arbitrary files from the connected ClickHouse server.
|
||||||
|
|
||||||
Credits: Andrey Krasichkov and Evgeny Sidorov of Yandex Information Security Team
|
Credits: Andrey Krasichkov and Evgeny Sidorov of Yandex Information Security Team
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
## Fixed in ClickHouse Release 1.1.54131, 2017-01-10
|
## Fixed in ClickHouse Release 1.1.54131, 2017-01-10
|
||||||
|
=======
|
||||||
|
## Fixed in ClickHouse release 1.1.54131, 2017-01-10
|
||||||
|
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
||||||
|
|
||||||
### CVE-2018-14670
|
### CVE-2018-14670
|
||||||
|
|
||||||
|
@ -170,7 +170,13 @@ pages:
|
|||||||
- 'How to write C++ code': 'development/style.md'
|
- 'How to write C++ code': 'development/style.md'
|
||||||
- 'How to run ClickHouse tests': 'development/tests.md'
|
- 'How to run ClickHouse tests': 'development/tests.md'
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
- 'What''s new':
|
- 'What''s new':
|
||||||
- 'Roadmap': 'roadmap.md'
|
- 'Roadmap': 'roadmap.md'
|
||||||
- 'Changelog': 'changelog.md'
|
- 'Changelog': 'changelog.md'
|
||||||
- 'Security changelog': 'security_changelog.md'
|
- 'Security changelog': 'security_changelog.md'
|
||||||
|
=======
|
||||||
|
- 'Roadmap': 'roadmap.md'
|
||||||
|
- 'Changelog': 'changelog.md'
|
||||||
|
- 'Security changelog': 'security_changelog.md'
|
||||||
|
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
||||||
|
@ -175,7 +175,13 @@ pages:
|
|||||||
- 'Как писать код на C++': 'development/style.md'
|
- 'Как писать код на C++': 'development/style.md'
|
||||||
- 'Как запустить тесты': 'development/tests.md'
|
- 'Как запустить тесты': 'development/tests.md'
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
- 'Что нового':
|
- 'Что нового':
|
||||||
- 'Changelog': 'changelog.md'
|
- 'Changelog': 'changelog.md'
|
||||||
- 'Security changelog': 'security_changelog.md'
|
- 'Security changelog': 'security_changelog.md'
|
||||||
- 'Roadmap': 'roadmap.md'
|
- 'Roadmap': 'roadmap.md'
|
||||||
|
=======
|
||||||
|
- 'Roadmap': 'roadmap.md'
|
||||||
|
- 'Changelog': 'changelog.md'
|
||||||
|
- 'Security changelog': 'security_changelog.md'
|
||||||
|
>>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
|
||||||
|
5
release
5
release
@ -105,12 +105,13 @@ if [ -z "$USE_PBUILDER" ] ; then
|
|||||||
else
|
else
|
||||||
export DIST=${DIST:=bionic}
|
export DIST=${DIST:=bionic}
|
||||||
export SET_BUILDRESULT=${SET_BUILDRESULT:=$CURDIR/..}
|
export SET_BUILDRESULT=${SET_BUILDRESULT:=$CURDIR/..}
|
||||||
. $CURDIR/debian/.pbuilderrc
|
|
||||||
|
|
||||||
if [[ -z `which pbuilder` ]] ; then
|
if [[ -z `which pbuilder` ]] ; then
|
||||||
sudo apt install -y pbuilder fakeroot debhelper debian-archive-keyring debian-keyring
|
sudo apt install -y pbuilder fakeroot debhelper debian-archive-keyring debian-keyring lsb-release
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
. $CURDIR/debian/.pbuilderrc
|
||||||
|
|
||||||
if [[ ! -e "/usr/share/debootstrap/scripts/${DIST}" ]] ; then
|
if [[ ! -e "/usr/share/debootstrap/scripts/${DIST}" ]] ; then
|
||||||
sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
|
sudo ln -s gutsy /usr/share/debootstrap/scripts/${DIST}
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user