Merge remote-tracking branch 'kcat/master'

.appveyor.yml

@@ -0,0 +1,23 @@
+version: 1.7.0-pre-{build}
+image: Visual Studio 2015
+configuration: Release
+environment:
+  runtime: v140
+  matrix:
+  - platform: x64
+    arch: x64
+  - platform: win32
+    arch: x86
+before_build:
+- cmd: nuget restore win32/kcat.sln
+build:
+  project: win32\kcat.sln
+  verbosity: detailed
+test: off
+artifacts:
+- path: '**\*.exe'
+  name: Exe
+- path: '**\*.dll'
+  name: DLLs
+- path: '**\*.dll'
+  name: DLLs

.github/workflows/codeql-analysis.yml

@@ -52,6 +52,7 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     - run: |
+       sudo apt-get update
        sudo apt-get install -y libssl-dev libsasl2-dev libcurl4-openssl-dev libjansson-dev
        ./bootstrap.sh
 

.gitignore

@@ -2,7 +2,7 @@
 *~
 *.o
 *.d
-kafkacat
+kcat
 config.cache
 config.log*
 config.h

.travis.yml

@@ -1,27 +1,26 @@
 language: c
-compiler:
-  - gcc
-  - clang
-env:
-   global:
-     - HOMEBREW_NO_AUTO_UPDATE=1
-os:
-  - linux
-  - osx
 dist: bionic
-arch:
-  - amd64
-  - ppc64le
 matrix:
-   exclude:
-      - os: osx
-        arch: ppc64le
+  include:
+    - name: "Linux x64 GCC"
+      os: linux
+      compiler: gcc
+      arch: amd64
+    - name: "Linux ppc64le Clang"
+      os: linux
+      arch: ppc64le
+      compiler: clang
+    - name: "MacOSX x64 Clang"
+      os: osx
+      compiler: clang
+      env: HOMEBREW_NO_AUTO_UPDATE=1
+
 before_install:
   - if [[ $TRAVIS_OS_NAME == linux ]]; then sudo apt-get update -qq && sudo apt-get install -y libssl-dev libsasl2-dev libcurl4-openssl-dev libjansson-dev ; fi
   - if [[ $TRAVIS_OS_NAME == osx ]]; then brew install openssl curl jansson ; fi
 
 script:
   - ./bootstrap.sh
-  - if [[ $TRAVIS_OS_NAME == osx ]]; then otool -L kafkacat ; else ldd kafkacat ; fi
-  - ./kafkacat -U
+  - if [[ $TRAVIS_OS_NAME == osx ]]; then otool -L kcat ; else ldd kcat ; fi
+  - ./kcat -U
 

CHANGELOG.md

@@ -1,10 +1,24 @@
-# kafkacat v1.7.0
+# kcat v1.7.0
 
+**kafkacat has been renamed to kcat** to adhere to the
+Apache Software Foundation's (ASF) trademark policies.
+
+ * `kafkacat` is now called `kcat`.
  * Add support for multibyte delimiters to `-D` and `-K` (#140, #280)
  * Add support for `-X partition.assignment.strategy=cooperative-sticky` incremental rebalancing.
  * High-level consumer `-G` now supports exit-on-eof `-e` option (#86)
  * Avro consumer with -J will now emit `key_schema_id` and `value_schema_id`.
 
+## Upgrade considerations
+
+ * Please rename any `kafkacat.conf` config files to `kcat.conf`.
+   The old path will continue to work for some time but a warning will be
+   printed.
+ * Please rename any `KAFKACAT_CONF` environment variables to `KCAT_CONF`.
+   The old environment variable will continue to work for some time but a
+   warning will be printed.
+
+
 
 # kafkacat v1.6.0
 
@@ -17,7 +31,7 @@
  * Print broker-id message was produced to (if `-v`),
    or was consumed from (if `-J`).
 
-## Apache Kafke EOS / Transactional Producer support
+## Apache Kafka EOS / Transactional Producer support
 
 Messages can now be produced in a single transaction if `-X transactional.id=..`
 is passed to the producer in `-P` mode.
@@ -40,4 +54,4 @@ And so is this
 
 # Older releases
 
-See https://github.com/edenhill/kafkacat/releases
+See https://github.com/edenhill/kcat/releases

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:3.10
 
-COPY . /usr/src/kafkacat
+COPY . /usr/src/kcat
 
 ENV BUILD_DEPS bash make gcc g++ cmake curl pkgconfig python perl bsd-compat-headers zlib-dev zstd-dev zstd-libs lz4-dev openssl-dev curl-dev
 
@@ -15,18 +15,18 @@ RUN echo Installing ; \
   apk add --no-cache --virtual .dev_pkgs $BUILD_DEPS $BUILD_DEPS_EXTRA && \
   apk add --no-cache $RUN_DEPS $RUN_DEPS_EXTRA && \
   echo Building && \
-  cd /usr/src/kafkacat && \
+  cd /usr/src/kcat && \
   rm -rf tmp-bootstrap && \
   echo "Source versions:" && \
   grep ^github_download ./bootstrap.sh && \
   ./bootstrap.sh --no-install-deps --no-enable-static && \
-  mv kafkacat /usr/bin/ && \
+  mv kcat /usr/bin/ && \
   echo Cleaning up && \
   cd / && \
-  rm -rf /usr/src/kafkacat && \
+  rm -rf /usr/src/kcat && \
   apk del .dev_pkgs && \
   rm -rf /var/cache/apk/*
 
-RUN kafkacat -V
+RUN kcat -V
 
-ENTRYPOINT ["kafkacat"]
+ENTRYPOINT ["kcat"]

Dockerfile.Debian

@@ -1,28 +1,28 @@
 FROM debian:stretch-slim
 
-COPY . /usr/src/kafkacat
+COPY . /usr/src/kcat
 
 ENV BUILD_DEPS build-essential zlib1g-dev liblz4-dev libssl-dev libsasl2-dev python cmake libcurl4-openssl-dev pkg-config
 ENV RUN_DEPS libssl1.1 libsasl2-2 ca-certificates curl
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $BUILD_DEPS $RUN_DEPS && \
   echo "Building" && \
-  cd /usr/src/kafkacat && \
+  cd /usr/src/kcat && \
   rm -rf tmp-bootstrap && \
   echo "Source versions:" && \
   grep ^github_download ./bootstrap.sh && \
   ./bootstrap.sh && \
-  mv kafkacat /usr/bin/ ; \
+  mv kcat /usr/bin/ ; \
   echo "Cleaning up" ; \
   cd / ; \
-  rm -rf /usr/src/kafkacat; \
+  rm -rf /usr/src/kcat; \
   apt-get purge -y --auto-remove $BUILD_DEPS ; \
   apt-get clean -y ; \
   apt-get autoclean -y ; \
   rm /var/log/dpkg.log /var/log/alternatives.log /var/log/apt/*.log; \
   rm -rf /var/lib/apt/lists/*
 
-RUN kafkacat -V
+RUN kcat -V
 
-ENTRYPOINT ["kafkacat"]
+ENTRYPOINT ["kcat"]

Makefile

@@ -1,8 +1,8 @@
 include Makefile.config
 
-BIN=	kafkacat
+BIN=	kcat
 
-SRCS_y=	kafkacat.c format.c tools.c input.c
+SRCS_y=	kcat.c format.c tools.c input.c
 SRCS_$(ENABLE_JSON) += json.c
 SRCS_$(ENABLE_AVRO) += avro.c
 OBJS=	$(SRCS_y:.c=.o)
@@ -13,15 +13,15 @@ all: $(BIN) TAGS
 
 include mklove/Makefile.base
 
-# librdkafka must be compiled with -gstrict-dwarf, but kafkacat must not,
+# librdkafka must be compiled with -gstrict-dwarf, but kcat must not,
 # due to some clang bug on OSX 10.9
 CPPFLAGS := $(subst strict-dwarf,,$(CPPFLAGS))
 
 install: bin-install install-man
 
 install-man:
 	echo $(INSTALL) -d $$DESTDIR$(man1dir) && \
-	echo $(INSTALL) kafkacat.1 $$DESTDIR$(man1dir)
+	echo $(INSTALL) kcat.1 $$DESTDIR$(man1dir)
 
 
 clean: bin-clean