diff options
| -rw-r--r-- | .github/workflows/build.yml | 24 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | src/libusbmuxd.c | 2 |
4 files changed, 24 insertions, 13 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a12d5cd..56248c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,14 +13,14 @@ jobs: run: | echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV - name: fetch libplist - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml name: libplist-latest_${{env.target_triplet}} repo: libimobiledevice/libplist - name: fetch libimobiledevice-glue - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml @@ -34,7 +34,7 @@ jobs: done sudo cp -r extract/* / sudo ldconfig - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: autogen run: ./autogen.sh PKG_CONFIG_PATH=/usr/local/lib/pkgconfig LDFLAGS="-Wl,-rpath=/usr/local/lib" - name: make @@ -47,7 +47,7 @@ jobs: DESTDIR=`pwd`/dest make install tar -C dest -cf libusbmuxd.tar usr - name: publish artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: libusbmuxd-latest_${{env.target_triplet}} path: libusbmuxd.tar @@ -63,14 +63,14 @@ jobs: fi shell: bash - name: fetch libplist - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml name: libplist-latest_macOS repo: libimobiledevice/libplist - name: fetch libimobiledevice-glue - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml @@ -83,7 +83,7 @@ jobs: tar -C extract -xvf $I done sudo cp -r extract/* / - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: autogen run: | SDKDIR=`xcrun --sdk macosx --show-sdk-path` @@ -107,7 +107,7 @@ jobs: DESTDIR=`pwd`/dest make install tar -C dest -cf libusbmuxd.tar usr - name: publish artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: libusbmuxd-latest_macOS path: libusbmuxd.tar @@ -144,14 +144,14 @@ jobs: echo "target_triplet=`gcc -dumpmachine`" >> $GITHUB_ENV git config --global core.autocrlf false - name: fetch libplist - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml name: libplist-latest_${{ matrix.arch }}-${{ env.dest }} repo: libimobiledevice/libplist - name: fetch libimobiledevice-glue - uses: dawidd6/action-download-artifact@v2 + uses: dawidd6/action-download-artifact@v3 with: github_token: ${{secrets.GITHUB_TOKEN}} workflow: build.yml @@ -164,7 +164,7 @@ jobs: tar -C extract -xvf $I done cp -r extract/* / - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: autogen run: ./autogen.sh CC=gcc CXX=g++ - name: make @@ -177,7 +177,7 @@ jobs: DESTDIR=`pwd`/dest make install tar -C dest -cf libusbmuxd.tar ${{ env.dest }} - name: publish artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: libusbmuxd-latest_${{ matrix.arch }}-${{ env.dest }} path: libusbmuxd.tar diff --git a/Makefile.am b/Makefile.am index 5ca15d0..559d84c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,4 +7,5 @@ EXTRA_DIST = \ git-version-gen dist-hook: + @if ! git diff --quiet; then echo "Uncommitted changes present; not releasing"; exit 1; fi echo $(VERSION) > $(distdir)/.tarball-version @@ -1,3 +1,13 @@ +Version 2.1.0 +~~~~~~~~~~~~~ + +* Changes: + - Socket code has been moved to libimobiledevice-glue library + - Code cleanup (clang-tidy) and improvements + - autoconf: Fix clang-16 breakage + - Add libusbmuxd_version() function to interface + - iproxy: Use updated socket_create API to listen on IPv4 and IPv6 with a single socket + Version 2.0.2 ~~~~~~~~~~~~~ diff --git a/src/libusbmuxd.c b/src/libusbmuxd.c index 8647ee2..8329bef 100644 --- a/src/libusbmuxd.c +++ b/src/libusbmuxd.c @@ -1593,7 +1593,7 @@ int usbmuxd_send(int sfd, const char *data, uint32_t len, uint32_t *sent_bytes) if (num_sent < 0) { *sent_bytes = 0; LIBUSBMUXD_DEBUG(1, "%s: Error %d when sending: %s\n", __func__, -num_sent, strerror(-num_sent)); - return -num_sent; + return num_sent; } if ((uint32_t)num_sent < len) { |