From ac9e7ed3e21106f169d8f7ca2c51cd6c77c757d8 Mon Sep 17 00:00:00 2001 From: lmangani Date: Mon, 26 Aug 2024 20:01:54 +0000 Subject: [PATCH] point to current repo --- README.md | 2 +- blockfile/blockfile.go | 10 +++++----- blockfile/blockfile_test.go | 6 +++--- config/config.go | 2 +- debian/control | 4 ++-- debian/copyright | 2 +- debian/stenographer.service | 2 +- debian/tests/run-example | 2 +- debian/upstream/metadata | 8 ++++---- debian/watch | 2 +- env/env.go | 16 ++++++++-------- filecache/filecache.go | 2 +- go.mod | 23 +++++++++++------------ go.sum | 36 ++++++++++++++++++++++++++++++++++++ httputil/httputil.go | 4 ++-- indexfile/indexfile.go | 6 +++--- indexfile/indexfile_test.go | 4 ++-- query/query.go | 6 +++--- rpc/rpc.go | 4 ++-- rpmbuild-steno-centos | 2 +- stenographer.go | 8 ++++---- stenographer.spec | 2 +- thread/thread.go | 16 ++++++++-------- thread/thread_test.go | 4 ++-- 24 files changed, 104 insertions(+), 69 deletions(-) create mode 100644 go.sum diff --git a/README.md b/README.md index 0b666cbe..cac22927 100644 --- a/README.md +++ b/README.md @@ -98,7 +98,7 @@ Downloading To download the source code, install Go locally, then run: - $ go install github.com/google/stenographer@latest + $ go install github.com/qxip/stenographer@latest Go will handle downloading and installing all Go libraries that `stenographer` depends on. To build `stenotype`, go into the `stenotype` directory and run `make`. diff --git a/blockfile/blockfile.go b/blockfile/blockfile.go index be2f2a5b..ea63eac9 100644 --- a/blockfile/blockfile.go +++ b/blockfile/blockfile.go @@ -25,11 +25,11 @@ import ( "unsafe" "github.com/google/gopacket" - "github.com/google/stenographer/base" - "github.com/google/stenographer/filecache" - "github.com/google/stenographer/indexfile" - "github.com/google/stenographer/query" - "github.com/google/stenographer/stats" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/filecache" + "github.com/qxip/stenographer/indexfile" + "github.com/qxip/stenographer/query" + "github.com/qxip/stenographer/stats" "golang.org/x/net/context" ) diff --git a/blockfile/blockfile_test.go b/blockfile/blockfile_test.go index ff56fcb3..f9af3c44 100644 --- a/blockfile/blockfile_test.go +++ b/blockfile/blockfile_test.go @@ -20,9 +20,9 @@ import ( "golang.org/x/net/context" - "github.com/google/stenographer/base" - "github.com/google/stenographer/filecache" - "github.com/google/stenographer/query" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/filecache" + "github.com/qxip/stenographer/query" ) var ctx = context.Background() diff --git a/config/config.go b/config/config.go index 1d9171fa..62700213 100644 --- a/config/config.go +++ b/config/config.go @@ -23,7 +23,7 @@ import ( "io/ioutil" "net" - "github.com/google/stenographer/base" + "github.com/qxip/stenographer/base" ) var v = base.V // verbose logging diff --git a/debian/control b/debian/control index f91a4fb7..96fb2b7d 100644 --- a/debian/control +++ b/debian/control @@ -17,10 +17,10 @@ Build-Depends: debhelper-compat (= 13), libseccomp-dev, txt2man Standards-Version: 4.5.0 -Homepage: https://github.com/google/stenographer +Homepage: https://github.com/qxip/stenographer Vcs-Browser: https://salsa.debian.org/go-team/packages/stenographer Vcs-Git: https://salsa.debian.org/go-team/packages/stenographer.git -XS-Go-Import-Path: github.com/google/stenographer +XS-Go-Import-Path: github.com/qxip/stenographer Package: stenographer Architecture: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x alpha hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 m68k powerpc powerpcspe sh4 sparc64 x32 diff --git a/debian/copyright b/debian/copyright index 4b58403a..b94d0d1b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,6 +1,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: stenographer -Source: +Source: Files: * Copyright: 2014-2015 Google Inc. diff --git a/debian/stenographer.service b/debian/stenographer.service index a08b854f..4744559c 100644 --- a/debian/stenographer.service +++ b/debian/stenographer.service @@ -19,7 +19,7 @@ [Unit] Description=packet capture to disk -Documentation=https://github.com/google/stenographer https://github.com/google/stenographer/blob/master/DESIGN.md https://github.com/google/stenographer/blob/master/INSTALL.md +Documentation=https://github.com/qxip/stenographer https://github.com/qxip/stenographer/blob/master/DESIGN.md https://github.com/qxip/stenographer/blob/master/INSTALL.md After=network.target [Service] diff --git a/debian/tests/run-example b/debian/tests/run-example index e19842b9..b28be2ab 100644 --- a/debian/tests/run-example +++ b/debian/tests/run-example @@ -33,7 +33,7 @@ systemctl is-active stenographer curl 'http://www.debian.org' > /dev/null # we need to wait a bit until packets appear in output, see -# https://github.com/google/stenographer/blob/master/DESIGN.md#packets-dont-show-up-immediately +# https://github.com/qxip/stenographer/blob/master/DESIGN.md#packets-dont-show-up-immediately sleep 180 # add client user diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 4e328933..e9924641 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,4 +1,4 @@ -Bug-Database: https://github.com/google/stenographer/issues -Bug-Submit: https://github.com/google/stenographer/issues/new -Repository: https://github.com/google/stenographer.git -Repository-Browse: https://github.com/google/stenographer +Bug-Database: https://github.com/qxip/stenographer/issues +Bug-Submit: https://github.com/qxip/stenographer/issues/new +Repository: https://github.com/qxip/stenographer.git +Repository-Browse: https://github.com/qxip/stenographer diff --git a/debian/watch b/debian/watch index ae9416f7..758d6dc8 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=4 -https://github.com/google/stenographer/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@ +https://github.com/qxip/stenographer/releases .*/archive/v?@ANY_VERSION@@ARCHIVE_EXT@ diff --git a/env/env.go b/env/env.go index b89acb09..875ac040 100644 --- a/env/env.go +++ b/env/env.go @@ -30,14 +30,14 @@ import ( "strings" "time" - "github.com/google/stenographer/base" - "github.com/google/stenographer/certs" - "github.com/google/stenographer/config" - "github.com/google/stenographer/filecache" - "github.com/google/stenographer/httputil" - "github.com/google/stenographer/query" - "github.com/google/stenographer/stats" - "github.com/google/stenographer/thread" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/certs" + "github.com/qxip/stenographer/config" + "github.com/qxip/stenographer/filecache" + "github.com/qxip/stenographer/httputil" + "github.com/qxip/stenographer/query" + "github.com/qxip/stenographer/stats" + "github.com/qxip/stenographer/thread" "golang.org/x/net/context" ) diff --git a/filecache/filecache.go b/filecache/filecache.go index e9379626..3648d668 100644 --- a/filecache/filecache.go +++ b/filecache/filecache.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/google/stenographer/base" + "github.com/qxip/stenographer/base" ) var v = base.V diff --git a/go.mod b/go.mod index 2d12b205..4959e65c 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,18 @@ module github.com/qxip/stenographer go 1.22.5 require ( - github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719 - github.com/golang/protobuf v1.5.4 - github.com/google/gopacket v1.1.19 - github.com/google/stenographer v1.0.1 - github.com/google/uuid v1.6.0 - golang.org/x/net v0.28.0 - google.golang.org/grpc v1.65.0 + github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719 + github.com/golang/protobuf v1.5.4 + github.com/google/gopacket v1.1.19 + github.com/google/uuid v1.6.0 + golang.org/x/net v0.28.0 + google.golang.org/grpc v1.65.0 ) require ( - github.com/golang/snappy v0.0.4 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.17.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/protobuf v1.34.1 // indirect + github.com/golang/snappy v0.0.4 // indirect + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/protobuf v1.34.1 // indirect ) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..5c258cfe --- /dev/null +++ b/go.sum @@ -0,0 +1,36 @@ +github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719 h1:yahFtfWlyALYDkXw2ETowZqG4vi8hiE0yOEBOkpaXl0= +github.com/golang/leveldb v0.0.0-20170107010102-259d9253d719/go.mod h1:etEpE0xVqxA0N3WNUa5wic5HCNSsQvYm+PFNmOnx2iU= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8= +github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= +google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= diff --git a/httputil/httputil.go b/httputil/httputil.go index 906e8512..450470fc 100644 --- a/httputil/httputil.go +++ b/httputil/httputil.go @@ -25,8 +25,8 @@ import ( "strings" "time" - "github.com/google/stenographer/base" - "github.com/google/stenographer/stats" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/stats" ) // Context returns a new context.Content that cancels when the diff --git a/indexfile/indexfile.go b/indexfile/indexfile.go index a531c957..c8ad8ff1 100644 --- a/indexfile/indexfile.go +++ b/indexfile/indexfile.go @@ -26,9 +26,9 @@ import ( "strings" "github.com/golang/leveldb/table" - "github.com/google/stenographer/base" - "github.com/google/stenographer/filecache" - "github.com/google/stenographer/stats" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/filecache" + "github.com/qxip/stenographer/stats" "golang.org/x/net/context" ) diff --git a/indexfile/indexfile_test.go b/indexfile/indexfile_test.go index e27e2cff..ef59bd97 100644 --- a/indexfile/indexfile_test.go +++ b/indexfile/indexfile_test.go @@ -22,8 +22,8 @@ import ( "golang.org/x/net/context" - "github.com/google/stenographer/base" - "github.com/google/stenographer/filecache" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/filecache" ) var ctx = context.Background() diff --git a/query/query.go b/query/query.go index 55e6880f..27912715 100644 --- a/query/query.go +++ b/query/query.go @@ -26,9 +26,9 @@ import ( "strings" "time" - "github.com/google/stenographer/base" - "github.com/google/stenographer/indexfile" - "github.com/google/stenographer/stats" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/indexfile" + "github.com/qxip/stenographer/stats" "golang.org/x/net/context" ) diff --git a/rpc/rpc.go b/rpc/rpc.go index fb250b78..a68c7a4f 100644 --- a/rpc/rpc.go +++ b/rpc/rpc.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/google/stenographer/config" - pb "github.com/google/stenographer/protobuf" + "github.com/qxip/stenographer/config" + pb "github.com/qxip/stenographer/protobuf" ) diff --git a/rpmbuild-steno-centos b/rpmbuild-steno-centos index 9952a1aa..dca0c8ef 100644 --- a/rpmbuild-steno-centos +++ b/rpmbuild-steno-centos @@ -19,7 +19,7 @@ TMP=`mktemp -d` pushd $TMP # pull lastest versions checked in to github -curl -L -J -O https://github.com/google/stenographer/archive/$commit.tar.gz +curl -L -J -O https://github.com/qxip/stenographer/archive/$commit.tar.gz # create working directory for rpmbuild to use mkdir -p $TMP/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS} diff --git a/stenographer.go b/stenographer.go index d75f1aa2..c1f11ff4 100644 --- a/stenographer.go +++ b/stenographer.go @@ -26,10 +26,10 @@ import ( "os" "runtime" - "github.com/google/stenographer/base" - "github.com/google/stenographer/config" - "github.com/google/stenographer/env" - "github.com/google/stenographer/rpc" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/config" + "github.com/qxip/stenographer/env" + "github.com/qxip/stenographer/rpc" _ "net/http/pprof" // server debugging info in /debug/pprof/* ) diff --git a/stenographer.spec b/stenographer.spec index 5cb46abc..cf67425a 100644 --- a/stenographer.spec +++ b/stenographer.spec @@ -19,7 +19,7 @@ Release: 1.%{builddate}git%{shortcommit0}%{?dist} Summary: A high-speed packet capture solution that provides indexed access License: Apache License, 2.0 -URL: https://github.com/google/stenographer +URL: https://github.com/qxip/stenographer Source0: https://github.com/google/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{commit0}.tar.gz BuildRequires: libaio-devel, leveldb-devel, snappy-devel, gcc-c++, make diff --git a/thread/thread.go b/thread/thread.go index e6daf051..d3e86c8b 100644 --- a/thread/thread.go +++ b/thread/thread.go @@ -30,14 +30,14 @@ import ( "sync" "time" - "github.com/google/stenographer/base" - "github.com/google/stenographer/blockfile" - "github.com/google/stenographer/config" - "github.com/google/stenographer/filecache" - "github.com/google/stenographer/httputil" - "github.com/google/stenographer/indexfile" - "github.com/google/stenographer/query" - "github.com/google/stenographer/stats" + "github.com/qxip/stenographer/base" + "github.com/qxip/stenographer/blockfile" + "github.com/qxip/stenographer/config" + "github.com/qxip/stenographer/filecache" + "github.com/qxip/stenographer/httputil" + "github.com/qxip/stenographer/indexfile" + "github.com/qxip/stenographer/query" + "github.com/qxip/stenographer/stats" "golang.org/x/net/context" ) diff --git a/thread/thread_test.go b/thread/thread_test.go index b1c193e7..eb734fc7 100644 --- a/thread/thread_test.go +++ b/thread/thread_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/google/stenographer/config" - "github.com/google/stenographer/filecache" + "github.com/qxip/stenographer/config" + "github.com/qxip/stenographer/filecache" ) const (